diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9e90c175..7f4f6c87e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -163,7 +163,7 @@ jobs: # which collapses the wall-clock time from ~1h to that of the slowest single example. build-examples: if: github.event_name == 'pull_request' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -196,7 +196,7 @@ jobs: # main: build all examples in release and publish them to GitHub Pages. build-examples-deploy: if: github.event_name == 'push' && github.ref == 'refs/heads/main' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v7 - uses: ./.github/actions/install-swift diff --git a/Benchmarks/Sources/Generated/BridgeJS.swift b/Benchmarks/Sources/Generated/BridgeJS.swift index 5e3e11db8..fc46623f2 100644 --- a/Benchmarks/Sources/Generated/BridgeJS.swift +++ b/Benchmarks/Sources/Generated/BridgeJS.swift @@ -399,7 +399,9 @@ public func _bjs_EnumRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_EnumRoundtrip_take") public func _bjs_EnumRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - EnumRoundtrip.bridgeJSLiftParameter(_self).take(_: APIResult.bridgeJSLiftParameter(value)) + let value = APIResult.bridgeJSLiftParameter(value) + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + _self.take(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -409,7 +411,8 @@ public func _bjs_EnumRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ value: I @_cdecl("bjs_EnumRoundtrip_makeSuccess") public func _bjs_EnumRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeSuccess() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeSuccess() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -420,7 +423,8 @@ public func _bjs_EnumRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_EnumRoundtrip_makeFailure") public func _bjs_EnumRoundtrip_makeFailure(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeFailure() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeFailure() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -431,7 +435,8 @@ public func _bjs_EnumRoundtrip_makeFailure(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_EnumRoundtrip_makeFlag") public func _bjs_EnumRoundtrip_makeFlag(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeFlag() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeFlag() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -442,7 +447,8 @@ public func _bjs_EnumRoundtrip_makeFlag(_ _self: UnsafeMutableRawPointer) -> Voi @_cdecl("bjs_EnumRoundtrip_makeRate") public func _bjs_EnumRoundtrip_makeRate(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeRate() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeRate() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -453,7 +459,8 @@ public func _bjs_EnumRoundtrip_makeRate(_ _self: UnsafeMutableRawPointer) -> Voi @_cdecl("bjs_EnumRoundtrip_makePrecise") public func _bjs_EnumRoundtrip_makePrecise(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makePrecise() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makePrecise() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -464,7 +471,8 @@ public func _bjs_EnumRoundtrip_makePrecise(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_EnumRoundtrip_makeInfo") public func _bjs_EnumRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).makeInfo() + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeInfo() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -475,7 +483,9 @@ public func _bjs_EnumRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointer) -> Voi @_cdecl("bjs_EnumRoundtrip_roundtrip") public func _bjs_EnumRoundtrip_roundtrip(_ _self: UnsafeMutableRawPointer, _ result: Int32) -> Void { #if arch(wasm32) - let ret = EnumRoundtrip.bridgeJSLiftParameter(_self).roundtrip(_: APIResult.bridgeJSLiftParameter(result)) + let result = APIResult.bridgeJSLiftParameter(result) + let _self = EnumRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtrip(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -528,7 +538,9 @@ public func _bjs_ComplexResultRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ComplexResultRoundtrip_take") public func _bjs_ComplexResultRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ComplexResultRoundtrip.bridgeJSLiftParameter(_self).take(_: ComplexResult.bridgeJSLiftParameter(value)) + let value = ComplexResult.bridgeJSLiftParameter(value) + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + _self.take(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -538,7 +550,8 @@ public func _bjs_ComplexResultRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_ComplexResultRoundtrip_makeSuccess") public func _bjs_ComplexResultRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeSuccess() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeSuccess() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -549,7 +562,8 @@ public func _bjs_ComplexResultRoundtrip_makeSuccess(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ComplexResultRoundtrip_makeError") public func _bjs_ComplexResultRoundtrip_makeError(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeError() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeError() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -560,7 +574,8 @@ public func _bjs_ComplexResultRoundtrip_makeError(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ComplexResultRoundtrip_makeLocation") public func _bjs_ComplexResultRoundtrip_makeLocation(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeLocation() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeLocation() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -571,7 +586,8 @@ public func _bjs_ComplexResultRoundtrip_makeLocation(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ComplexResultRoundtrip_makeStatus") public func _bjs_ComplexResultRoundtrip_makeStatus(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeStatus() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeStatus() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -582,7 +598,8 @@ public func _bjs_ComplexResultRoundtrip_makeStatus(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ComplexResultRoundtrip_makeCoordinates") public func _bjs_ComplexResultRoundtrip_makeCoordinates(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeCoordinates() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeCoordinates() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -593,7 +610,8 @@ public func _bjs_ComplexResultRoundtrip_makeCoordinates(_ _self: UnsafeMutableRa @_cdecl("bjs_ComplexResultRoundtrip_makeComprehensive") public func _bjs_ComplexResultRoundtrip_makeComprehensive(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeComprehensive() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeComprehensive() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -604,7 +622,8 @@ public func _bjs_ComplexResultRoundtrip_makeComprehensive(_ _self: UnsafeMutable @_cdecl("bjs_ComplexResultRoundtrip_makeInfo") public func _bjs_ComplexResultRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).makeInfo() + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeInfo() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -615,7 +634,9 @@ public func _bjs_ComplexResultRoundtrip_makeInfo(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_ComplexResultRoundtrip_roundtrip") public func _bjs_ComplexResultRoundtrip_roundtrip(_ _self: UnsafeMutableRawPointer, _ result: Int32) -> Void { #if arch(wasm32) - let ret = ComplexResultRoundtrip.bridgeJSLiftParameter(_self).roundtrip(_: ComplexResult.bridgeJSLiftParameter(result)) + let result = ComplexResult.bridgeJSLiftParameter(result) + let _self = ComplexResultRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtrip(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -668,7 +689,9 @@ public func _bjs_StringRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_StringRoundtrip_take") public func _bjs_StringRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StringRoundtrip.bridgeJSLiftParameter(_self).take(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = StringRoundtrip.bridgeJSLiftParameter(_self) + _self.take(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -678,7 +701,8 @@ public func _bjs_StringRoundtrip_take(_ _self: UnsafeMutableRawPointer, _ valueB @_cdecl("bjs_StringRoundtrip_make") public func _bjs_StringRoundtrip_make(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StringRoundtrip.bridgeJSLiftParameter(_self).make() + let _self = StringRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.make() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -731,7 +755,8 @@ public func _bjs_OptionalReturnRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_OptionalReturnRoundtrip_makeIntSome") public func _bjs_OptionalReturnRoundtrip_makeIntSome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeIntSome() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeIntSome() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -742,7 +767,8 @@ public func _bjs_OptionalReturnRoundtrip_makeIntSome(_ _self: UnsafeMutableRawPo @_cdecl("bjs_OptionalReturnRoundtrip_makeIntNone") public func _bjs_OptionalReturnRoundtrip_makeIntNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeIntNone() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeIntNone() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -753,7 +779,8 @@ public func _bjs_OptionalReturnRoundtrip_makeIntNone(_ _self: UnsafeMutableRawPo @_cdecl("bjs_OptionalReturnRoundtrip_makeBoolSome") public func _bjs_OptionalReturnRoundtrip_makeBoolSome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeBoolSome() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeBoolSome() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -764,7 +791,8 @@ public func _bjs_OptionalReturnRoundtrip_makeBoolSome(_ _self: UnsafeMutableRawP @_cdecl("bjs_OptionalReturnRoundtrip_makeBoolNone") public func _bjs_OptionalReturnRoundtrip_makeBoolNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeBoolNone() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeBoolNone() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -775,7 +803,8 @@ public func _bjs_OptionalReturnRoundtrip_makeBoolNone(_ _self: UnsafeMutableRawP @_cdecl("bjs_OptionalReturnRoundtrip_makeDoubleSome") public func _bjs_OptionalReturnRoundtrip_makeDoubleSome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeDoubleSome() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeDoubleSome() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -786,7 +815,8 @@ public func _bjs_OptionalReturnRoundtrip_makeDoubleSome(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalReturnRoundtrip_makeDoubleNone") public func _bjs_OptionalReturnRoundtrip_makeDoubleNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeDoubleNone() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeDoubleNone() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -797,7 +827,8 @@ public func _bjs_OptionalReturnRoundtrip_makeDoubleNone(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalReturnRoundtrip_makeStringSome") public func _bjs_OptionalReturnRoundtrip_makeStringSome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeStringSome() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeStringSome() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -808,7 +839,8 @@ public func _bjs_OptionalReturnRoundtrip_makeStringSome(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalReturnRoundtrip_makeStringNone") public func _bjs_OptionalReturnRoundtrip_makeStringNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self).makeStringNone() + let _self = OptionalReturnRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeStringNone() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -861,7 +893,9 @@ public func _bjs_StructRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_StructRoundtrip_takeSimple") public func _bjs_StructRoundtrip_takeSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - StructRoundtrip.bridgeJSLiftParameter(_self).takeSimple(_: SimpleStruct.bridgeJSLiftParameter()) + let value = SimpleStruct.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + _self.takeSimple(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -871,7 +905,8 @@ public func _bjs_StructRoundtrip_takeSimple(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_StructRoundtrip_makeSimple") public func _bjs_StructRoundtrip_makeSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeSimple() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeSimple() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -882,7 +917,9 @@ public func _bjs_StructRoundtrip_makeSimple(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_StructRoundtrip_roundtripSimple") public func _bjs_StructRoundtrip_roundtripSimple(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripSimple(_: SimpleStruct.bridgeJSLiftParameter()) + let value = SimpleStruct.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripSimple(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -893,7 +930,9 @@ public func _bjs_StructRoundtrip_roundtripSimple(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_StructRoundtrip_takeAddress") public func _bjs_StructRoundtrip_takeAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - StructRoundtrip.bridgeJSLiftParameter(_self).takeAddress(_: Address.bridgeJSLiftParameter()) + let value = Address.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + _self.takeAddress(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -903,7 +942,8 @@ public func _bjs_StructRoundtrip_takeAddress(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_StructRoundtrip_makeAddress") public func _bjs_StructRoundtrip_makeAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeAddress() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeAddress() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -914,7 +954,9 @@ public func _bjs_StructRoundtrip_makeAddress(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_StructRoundtrip_roundtripAddress") public func _bjs_StructRoundtrip_roundtripAddress(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripAddress(_: Address.bridgeJSLiftParameter()) + let value = Address.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripAddress(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -925,7 +967,9 @@ public func _bjs_StructRoundtrip_roundtripAddress(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_StructRoundtrip_takePerson") public func _bjs_StructRoundtrip_takePerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - StructRoundtrip.bridgeJSLiftParameter(_self).takePerson(_: Person.bridgeJSLiftParameter()) + let value = Person.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + _self.takePerson(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -935,7 +979,8 @@ public func _bjs_StructRoundtrip_takePerson(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_StructRoundtrip_makePerson") public func _bjs_StructRoundtrip_makePerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makePerson() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makePerson() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -946,7 +991,9 @@ public func _bjs_StructRoundtrip_makePerson(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_StructRoundtrip_roundtripPerson") public func _bjs_StructRoundtrip_roundtripPerson(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripPerson(_: Person.bridgeJSLiftParameter()) + let value = Person.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripPerson(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -957,7 +1004,9 @@ public func _bjs_StructRoundtrip_roundtripPerson(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_StructRoundtrip_takeComplex") public func _bjs_StructRoundtrip_takeComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - StructRoundtrip.bridgeJSLiftParameter(_self).takeComplex(_: ComplexStruct.bridgeJSLiftParameter()) + let value = ComplexStruct.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + _self.takeComplex(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -967,7 +1016,8 @@ public func _bjs_StructRoundtrip_takeComplex(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_StructRoundtrip_makeComplex") public func _bjs_StructRoundtrip_makeComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).makeComplex() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeComplex() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -978,7 +1028,9 @@ public func _bjs_StructRoundtrip_makeComplex(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_StructRoundtrip_roundtripComplex") public func _bjs_StructRoundtrip_roundtripComplex(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = StructRoundtrip.bridgeJSLiftParameter(_self).roundtripComplex(_: ComplexStruct.bridgeJSLiftParameter()) + let value = ComplexStruct.bridgeJSLiftParameter() + let _self = StructRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripComplex(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1020,7 +1072,12 @@ fileprivate func _bjs_StructRoundtrip_wrap_extern(_ pointer: UnsafeMutableRawPoi @_cdecl("bjs_SimpleClass_init") public func _bjs_SimpleClass_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ flag: Int32, _ rate: Float32, _ precise: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SimpleClass(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), flag: Bool.bridgeJSLiftParameter(flag), rate: Float.bridgeJSLiftParameter(rate), precise: Double.bridgeJSLiftParameter(precise)) + let precise = Double.bridgeJSLiftParameter(precise) + let rate = Float.bridgeJSLiftParameter(rate) + let flag = Bool.bridgeJSLiftParameter(flag) + let count = Int.bridgeJSLiftParameter(count) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = SimpleClass(name: name, count: count, flag: flag, rate: rate, precise: precise) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1031,7 +1088,8 @@ public func _bjs_SimpleClass_init(_ nameBytes: Int32, _ nameLength: Int32, _ cou @_cdecl("bjs_SimpleClass_name_get") public func _bjs_SimpleClass_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SimpleClass.bridgeJSLiftParameter(_self).name + let _self = SimpleClass.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1042,7 +1100,9 @@ public func _bjs_SimpleClass_name_get(_ _self: UnsafeMutableRawPointer) -> Void @_cdecl("bjs_SimpleClass_name_set") public func _bjs_SimpleClass_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - SimpleClass.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = SimpleClass.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -1052,7 +1112,8 @@ public func _bjs_SimpleClass_name_set(_ _self: UnsafeMutableRawPointer, _ valueB @_cdecl("bjs_SimpleClass_count_get") public func _bjs_SimpleClass_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SimpleClass.bridgeJSLiftParameter(_self).count + let _self = SimpleClass.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1063,7 +1124,9 @@ public func _bjs_SimpleClass_count_get(_ _self: UnsafeMutableRawPointer) -> Int3 @_cdecl("bjs_SimpleClass_count_set") public func _bjs_SimpleClass_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SimpleClass.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = SimpleClass.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif @@ -1073,7 +1136,8 @@ public func _bjs_SimpleClass_count_set(_ _self: UnsafeMutableRawPointer, _ value @_cdecl("bjs_SimpleClass_flag_get") public func _bjs_SimpleClass_flag_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SimpleClass.bridgeJSLiftParameter(_self).flag + let _self = SimpleClass.bridgeJSLiftParameter(_self) + let ret = _self.flag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1084,7 +1148,9 @@ public func _bjs_SimpleClass_flag_get(_ _self: UnsafeMutableRawPointer) -> Int32 @_cdecl("bjs_SimpleClass_flag_set") public func _bjs_SimpleClass_flag_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SimpleClass.bridgeJSLiftParameter(_self).flag = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = SimpleClass.bridgeJSLiftParameter(_self) + _self.flag = value #else fatalError("Only available on WebAssembly") #endif @@ -1094,7 +1160,8 @@ public func _bjs_SimpleClass_flag_set(_ _self: UnsafeMutableRawPointer, _ value: @_cdecl("bjs_SimpleClass_rate_get") public func _bjs_SimpleClass_rate_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = SimpleClass.bridgeJSLiftParameter(_self).rate + let _self = SimpleClass.bridgeJSLiftParameter(_self) + let ret = _self.rate return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1105,7 +1172,9 @@ public func _bjs_SimpleClass_rate_get(_ _self: UnsafeMutableRawPointer) -> Float @_cdecl("bjs_SimpleClass_rate_set") public func _bjs_SimpleClass_rate_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) - SimpleClass.bridgeJSLiftParameter(_self).rate = Float.bridgeJSLiftParameter(value) + let value = Float.bridgeJSLiftParameter(value) + let _self = SimpleClass.bridgeJSLiftParameter(_self) + _self.rate = value #else fatalError("Only available on WebAssembly") #endif @@ -1115,7 +1184,8 @@ public func _bjs_SimpleClass_rate_set(_ _self: UnsafeMutableRawPointer, _ value: @_cdecl("bjs_SimpleClass_precise_get") public func _bjs_SimpleClass_precise_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = SimpleClass.bridgeJSLiftParameter(_self).precise + let _self = SimpleClass.bridgeJSLiftParameter(_self) + let ret = _self.precise return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1126,7 +1196,9 @@ public func _bjs_SimpleClass_precise_get(_ _self: UnsafeMutableRawPointer) -> Fl @_cdecl("bjs_SimpleClass_precise_set") public func _bjs_SimpleClass_precise_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) - SimpleClass.bridgeJSLiftParameter(_self).precise = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + let _self = SimpleClass.bridgeJSLiftParameter(_self) + _self.precise = value #else fatalError("Only available on WebAssembly") #endif @@ -1167,7 +1239,10 @@ fileprivate func _bjs_SimpleClass_wrap_extern(_ pointer: UnsafeMutableRawPointer @_cdecl("bjs_AddressClass_init") public func _bjs_AddressClass_init(_ streetBytes: Int32, _ streetLength: Int32, _ cityBytes: Int32, _ cityLength: Int32, _ zipCode: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = AddressClass(street: String.bridgeJSLiftParameter(streetBytes, streetLength), city: String.bridgeJSLiftParameter(cityBytes, cityLength), zipCode: Int.bridgeJSLiftParameter(zipCode)) + let zipCode = Int.bridgeJSLiftParameter(zipCode) + let city = String.bridgeJSLiftParameter(cityBytes, cityLength) + let street = String.bridgeJSLiftParameter(streetBytes, streetLength) + let ret = AddressClass(street: street, city: city, zipCode: zipCode) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1178,7 +1253,8 @@ public func _bjs_AddressClass_init(_ streetBytes: Int32, _ streetLength: Int32, @_cdecl("bjs_AddressClass_street_get") public func _bjs_AddressClass_street_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = AddressClass.bridgeJSLiftParameter(_self).street + let _self = AddressClass.bridgeJSLiftParameter(_self) + let ret = _self.street return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1189,7 +1265,9 @@ public func _bjs_AddressClass_street_get(_ _self: UnsafeMutableRawPointer) -> Vo @_cdecl("bjs_AddressClass_street_set") public func _bjs_AddressClass_street_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - AddressClass.bridgeJSLiftParameter(_self).street = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = AddressClass.bridgeJSLiftParameter(_self) + _self.street = value #else fatalError("Only available on WebAssembly") #endif @@ -1199,7 +1277,8 @@ public func _bjs_AddressClass_street_set(_ _self: UnsafeMutableRawPointer, _ val @_cdecl("bjs_AddressClass_city_get") public func _bjs_AddressClass_city_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = AddressClass.bridgeJSLiftParameter(_self).city + let _self = AddressClass.bridgeJSLiftParameter(_self) + let ret = _self.city return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1210,7 +1289,9 @@ public func _bjs_AddressClass_city_get(_ _self: UnsafeMutableRawPointer) -> Void @_cdecl("bjs_AddressClass_city_set") public func _bjs_AddressClass_city_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - AddressClass.bridgeJSLiftParameter(_self).city = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = AddressClass.bridgeJSLiftParameter(_self) + _self.city = value #else fatalError("Only available on WebAssembly") #endif @@ -1220,7 +1301,8 @@ public func _bjs_AddressClass_city_set(_ _self: UnsafeMutableRawPointer, _ value @_cdecl("bjs_AddressClass_zipCode_get") public func _bjs_AddressClass_zipCode_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = AddressClass.bridgeJSLiftParameter(_self).zipCode + let _self = AddressClass.bridgeJSLiftParameter(_self) + let ret = _self.zipCode return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1231,7 +1313,9 @@ public func _bjs_AddressClass_zipCode_get(_ _self: UnsafeMutableRawPointer) -> I @_cdecl("bjs_AddressClass_zipCode_set") public func _bjs_AddressClass_zipCode_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - AddressClass.bridgeJSLiftParameter(_self).zipCode = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = AddressClass.bridgeJSLiftParameter(_self) + _self.zipCode = value #else fatalError("Only available on WebAssembly") #endif @@ -1283,7 +1367,9 @@ public func _bjs_ClassRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ClassRoundtrip_takeSimpleClass") public func _bjs_ClassRoundtrip_takeSimpleClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassRoundtrip.bridgeJSLiftParameter(_self).takeSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) + let value = SimpleClass.bridgeJSLiftParameter(value) + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + _self.takeSimpleClass(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -1293,7 +1379,8 @@ public func _bjs_ClassRoundtrip_takeSimpleClass(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ClassRoundtrip_makeSimpleClass") public func _bjs_ClassRoundtrip_makeSimpleClass(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeSimpleClass() + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeSimpleClass() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1304,7 +1391,9 @@ public func _bjs_ClassRoundtrip_makeSimpleClass(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ClassRoundtrip_roundtripSimpleClass") public func _bjs_ClassRoundtrip_roundtripSimpleClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripSimpleClass(_: SimpleClass.bridgeJSLiftParameter(value)) + let value = SimpleClass.bridgeJSLiftParameter(value) + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripSimpleClass(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1315,7 +1404,9 @@ public func _bjs_ClassRoundtrip_roundtripSimpleClass(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ClassRoundtrip_takeAddressClass") public func _bjs_ClassRoundtrip_takeAddressClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassRoundtrip.bridgeJSLiftParameter(_self).takeAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) + let value = AddressClass.bridgeJSLiftParameter(value) + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + _self.takeAddressClass(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -1325,7 +1416,8 @@ public func _bjs_ClassRoundtrip_takeAddressClass(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_ClassRoundtrip_makeAddressClass") public func _bjs_ClassRoundtrip_makeAddressClass(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).makeAddressClass() + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeAddressClass() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1336,7 +1428,9 @@ public func _bjs_ClassRoundtrip_makeAddressClass(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_ClassRoundtrip_roundtripAddressClass") public func _bjs_ClassRoundtrip_roundtripAddressClass(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtrip.bridgeJSLiftParameter(_self).roundtripAddressClass(_: AddressClass.bridgeJSLiftParameter(value)) + let value = AddressClass.bridgeJSLiftParameter(value) + let _self = ClassRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripAddressClass(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1389,7 +1483,9 @@ public func _bjs_ClassArrayRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ClassArrayRoundtrip_setupPool") public func _bjs_ClassArrayRoundtrip_setupPool(_ _self: UnsafeMutableRawPointer, _ count: Int32) -> Void { #if arch(wasm32) - ClassArrayRoundtrip.bridgeJSLiftParameter(_self).setupPool(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let _self = ClassArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.setupPool(_: count) #else fatalError("Only available on WebAssembly") #endif @@ -1399,7 +1495,8 @@ public func _bjs_ClassArrayRoundtrip_setupPool(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_ClassArrayRoundtrip_getPool") public func _bjs_ClassArrayRoundtrip_getPool(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ClassArrayRoundtrip.bridgeJSLiftParameter(_self).getPool() + let _self = ClassArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.getPool() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1410,7 +1507,8 @@ public func _bjs_ClassArrayRoundtrip_getPool(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ClassArrayRoundtrip_makeClassArray") public func _bjs_ClassArrayRoundtrip_makeClassArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ClassArrayRoundtrip.bridgeJSLiftParameter(_self).makeClassArray() + let _self = ClassArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeClassArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1421,7 +1519,9 @@ public func _bjs_ClassArrayRoundtrip_makeClassArray(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ClassArrayRoundtrip_takeClassArray") public func _bjs_ClassArrayRoundtrip_takeClassArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassArrayRoundtrip.bridgeJSLiftParameter(_self).takeClassArray(_: [SimpleClass].bridgeJSStackPop()) + let values = [SimpleClass].bridgeJSStackPop() + let _self = ClassArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeClassArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -1431,7 +1531,9 @@ public func _bjs_ClassArrayRoundtrip_takeClassArray(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ClassArrayRoundtrip_roundtripClassArray") public func _bjs_ClassArrayRoundtrip_roundtripClassArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ClassArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripClassArray(_: [SimpleClass].bridgeJSStackPop()) + let values = [SimpleClass].bridgeJSStackPop() + let _self = ClassArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripClassArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1484,7 +1586,9 @@ public func _bjs_IdentityCacheBenchmark_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_IdentityCacheBenchmark_setupPool") public func _bjs_IdentityCacheBenchmark_setupPool(_ _self: UnsafeMutableRawPointer, _ count: Int32) -> Void { #if arch(wasm32) - IdentityCacheBenchmark.bridgeJSLiftParameter(_self).setupPool(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let _self = IdentityCacheBenchmark.bridgeJSLiftParameter(_self) + _self.setupPool(_: count) #else fatalError("Only available on WebAssembly") #endif @@ -1494,7 +1598,8 @@ public func _bjs_IdentityCacheBenchmark_setupPool(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_IdentityCacheBenchmark_getPoolRepeated") public func _bjs_IdentityCacheBenchmark_getPoolRepeated(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = IdentityCacheBenchmark.bridgeJSLiftParameter(_self).getPoolRepeated() + let _self = IdentityCacheBenchmark.bridgeJSLiftParameter(_self) + let ret = _self.getPoolRepeated() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1536,7 +1641,12 @@ fileprivate func _bjs_IdentityCacheBenchmark_wrap_extern(_ pointer: UnsafeMutabl @_cdecl("bjs_SimpleClassIdentity_init") public func _bjs_SimpleClassIdentity_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ flag: Int32, _ rate: Float32, _ precise: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SimpleClassIdentity(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), flag: Bool.bridgeJSLiftParameter(flag), rate: Float.bridgeJSLiftParameter(rate), precise: Double.bridgeJSLiftParameter(precise)) + let precise = Double.bridgeJSLiftParameter(precise) + let rate = Float.bridgeJSLiftParameter(rate) + let flag = Bool.bridgeJSLiftParameter(flag) + let count = Int.bridgeJSLiftParameter(count) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = SimpleClassIdentity(name: name, count: count, flag: flag, rate: rate, precise: precise) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1547,7 +1657,8 @@ public func _bjs_SimpleClassIdentity_init(_ nameBytes: Int32, _ nameLength: Int3 @_cdecl("bjs_SimpleClassIdentity_name_get") public func _bjs_SimpleClassIdentity_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SimpleClassIdentity.bridgeJSLiftParameter(_self).name + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1558,7 +1669,9 @@ public func _bjs_SimpleClassIdentity_name_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SimpleClassIdentity_name_set") public func _bjs_SimpleClassIdentity_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - SimpleClassIdentity.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -1568,7 +1681,8 @@ public func _bjs_SimpleClassIdentity_name_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SimpleClassIdentity_count_get") public func _bjs_SimpleClassIdentity_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SimpleClassIdentity.bridgeJSLiftParameter(_self).count + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1579,7 +1693,9 @@ public func _bjs_SimpleClassIdentity_count_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SimpleClassIdentity_count_set") public func _bjs_SimpleClassIdentity_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SimpleClassIdentity.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif @@ -1589,7 +1705,8 @@ public func _bjs_SimpleClassIdentity_count_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SimpleClassIdentity_flag_get") public func _bjs_SimpleClassIdentity_flag_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SimpleClassIdentity.bridgeJSLiftParameter(_self).flag + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + let ret = _self.flag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1600,7 +1717,9 @@ public func _bjs_SimpleClassIdentity_flag_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SimpleClassIdentity_flag_set") public func _bjs_SimpleClassIdentity_flag_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SimpleClassIdentity.bridgeJSLiftParameter(_self).flag = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + _self.flag = value #else fatalError("Only available on WebAssembly") #endif @@ -1610,7 +1729,8 @@ public func _bjs_SimpleClassIdentity_flag_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SimpleClassIdentity_rate_get") public func _bjs_SimpleClassIdentity_rate_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = SimpleClassIdentity.bridgeJSLiftParameter(_self).rate + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + let ret = _self.rate return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1621,7 +1741,9 @@ public func _bjs_SimpleClassIdentity_rate_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SimpleClassIdentity_rate_set") public func _bjs_SimpleClassIdentity_rate_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) - SimpleClassIdentity.bridgeJSLiftParameter(_self).rate = Float.bridgeJSLiftParameter(value) + let value = Float.bridgeJSLiftParameter(value) + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + _self.rate = value #else fatalError("Only available on WebAssembly") #endif @@ -1631,7 +1753,8 @@ public func _bjs_SimpleClassIdentity_rate_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SimpleClassIdentity_precise_get") public func _bjs_SimpleClassIdentity_precise_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = SimpleClassIdentity.bridgeJSLiftParameter(_self).precise + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + let ret = _self.precise return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1642,7 +1765,9 @@ public func _bjs_SimpleClassIdentity_precise_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_SimpleClassIdentity_precise_set") public func _bjs_SimpleClassIdentity_precise_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) - SimpleClassIdentity.bridgeJSLiftParameter(_self).precise = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + let _self = SimpleClassIdentity.bridgeJSLiftParameter(_self) + _self.precise = value #else fatalError("Only available on WebAssembly") #endif @@ -1694,7 +1819,9 @@ public func _bjs_ClassRoundtripIdentity_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ClassRoundtripIdentity_roundtripSimpleClassIdentity") public func _bjs_ClassRoundtripIdentity_roundtripSimpleClassIdentity(_ _self: UnsafeMutableRawPointer, _ obj: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtripIdentity.bridgeJSLiftParameter(_self).roundtripSimpleClassIdentity(_: SimpleClassIdentity.bridgeJSLiftParameter(obj)) + let obj = SimpleClassIdentity.bridgeJSLiftParameter(obj) + let _self = ClassRoundtripIdentity.bridgeJSLiftParameter(_self) + let ret = _self.roundtripSimpleClassIdentity(_: obj) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1705,7 +1832,8 @@ public func _bjs_ClassRoundtripIdentity_roundtripSimpleClassIdentity(_ _self: Un @_cdecl("bjs_ClassRoundtripIdentity_makeSimpleClassIdentity") public func _bjs_ClassRoundtripIdentity_makeSimpleClassIdentity(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ClassRoundtripIdentity.bridgeJSLiftParameter(_self).makeSimpleClassIdentity() + let _self = ClassRoundtripIdentity.bridgeJSLiftParameter(_self) + let ret = _self.makeSimpleClassIdentity() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -1716,7 +1844,9 @@ public func _bjs_ClassRoundtripIdentity_makeSimpleClassIdentity(_ _self: UnsafeM @_cdecl("bjs_ClassRoundtripIdentity_takeSimpleClassIdentity") public func _bjs_ClassRoundtripIdentity_takeSimpleClassIdentity(_ _self: UnsafeMutableRawPointer, _ obj: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassRoundtripIdentity.bridgeJSLiftParameter(_self).takeSimpleClassIdentity(_: SimpleClassIdentity.bridgeJSLiftParameter(obj)) + let obj = SimpleClassIdentity.bridgeJSLiftParameter(obj) + let _self = ClassRoundtripIdentity.bridgeJSLiftParameter(_self) + _self.takeSimpleClassIdentity(_: obj) #else fatalError("Only available on WebAssembly") #endif @@ -1768,7 +1898,9 @@ public func _bjs_IdentityCacheBenchmarkIdentity_init() -> UnsafeMutableRawPointe @_cdecl("bjs_IdentityCacheBenchmarkIdentity_setupPool") public func _bjs_IdentityCacheBenchmarkIdentity_setupPool(_ _self: UnsafeMutableRawPointer, _ count: Int32) -> Void { #if arch(wasm32) - IdentityCacheBenchmarkIdentity.bridgeJSLiftParameter(_self).setupPool(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let _self = IdentityCacheBenchmarkIdentity.bridgeJSLiftParameter(_self) + _self.setupPool(_: count) #else fatalError("Only available on WebAssembly") #endif @@ -1778,7 +1910,8 @@ public func _bjs_IdentityCacheBenchmarkIdentity_setupPool(_ _self: UnsafeMutable @_cdecl("bjs_IdentityCacheBenchmarkIdentity_getPoolRepeated") public func _bjs_IdentityCacheBenchmarkIdentity_getPoolRepeated(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = IdentityCacheBenchmarkIdentity.bridgeJSLiftParameter(_self).getPoolRepeated() + let _self = IdentityCacheBenchmarkIdentity.bridgeJSLiftParameter(_self) + let ret = _self.getPoolRepeated() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1831,7 +1964,9 @@ public func _bjs_ArrayRoundtrip_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_ArrayRoundtrip_takeIntArray") public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeIntArray(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeIntArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -1841,7 +1976,8 @@ public func _bjs_ArrayRoundtrip_takeIntArray(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ArrayRoundtrip_makeIntArray") public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeIntArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1852,7 +1988,9 @@ public func _bjs_ArrayRoundtrip_makeIntArray(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ArrayRoundtrip_roundtripIntArray") public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripIntArray(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1863,7 +2001,8 @@ public func _bjs_ArrayRoundtrip_roundtripIntArray(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ArrayRoundtrip_makeIntArrayLarge") public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeIntArrayLarge() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeIntArrayLarge() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1874,7 +2013,9 @@ public func _bjs_ArrayRoundtrip_makeIntArrayLarge(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ArrayRoundtrip_takeDoubleArray") public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeDoubleArray(_: [Double].bridgeJSStackPop()) + let values = [Double].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeDoubleArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -1884,7 +2025,8 @@ public func _bjs_ArrayRoundtrip_takeDoubleArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_makeDoubleArray") public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeDoubleArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeDoubleArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1895,7 +2037,9 @@ public func _bjs_ArrayRoundtrip_makeDoubleArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripDoubleArray") public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripDoubleArray(_: [Double].bridgeJSStackPop()) + let values = [Double].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripDoubleArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1906,7 +2050,9 @@ public func _bjs_ArrayRoundtrip_roundtripDoubleArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takeStringArray") public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeStringArray(_: [String].bridgeJSStackPop()) + let values = [String].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeStringArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -1916,7 +2062,8 @@ public func _bjs_ArrayRoundtrip_takeStringArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_makeStringArray") public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeStringArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeStringArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1927,7 +2074,9 @@ public func _bjs_ArrayRoundtrip_makeStringArray(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ArrayRoundtrip_roundtripStringArray") public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripStringArray(_: [String].bridgeJSStackPop()) + let values = [String].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripStringArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1938,7 +2087,9 @@ public func _bjs_ArrayRoundtrip_roundtripStringArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_takePointArray") public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takePointArray(_: [Point].bridgeJSStackPop()) + let points = [Point].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takePointArray(_: points) #else fatalError("Only available on WebAssembly") #endif @@ -1948,7 +2099,8 @@ public func _bjs_ArrayRoundtrip_takePointArray(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ArrayRoundtrip_makePointArray") public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makePointArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1959,7 +2111,9 @@ public func _bjs_ArrayRoundtrip_makePointArray(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ArrayRoundtrip_roundtripPointArray") public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripPointArray(_: [Point].bridgeJSStackPop()) + let points = [Point].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1970,7 +2124,8 @@ public func _bjs_ArrayRoundtrip_roundtripPointArray(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ArrayRoundtrip_makePointArrayLarge") public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makePointArrayLarge() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makePointArrayLarge() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -1981,7 +2136,9 @@ public func _bjs_ArrayRoundtrip_makePointArrayLarge(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_ArrayRoundtrip_takeNestedIntArray") public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedIntArray(_: [[Int]].bridgeJSStackPop()) + let values = [[Int]].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeNestedIntArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -1991,7 +2148,8 @@ public func _bjs_ArrayRoundtrip_takeNestedIntArray(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ArrayRoundtrip_makeNestedIntArray") public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedIntArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeNestedIntArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2002,7 +2160,9 @@ public func _bjs_ArrayRoundtrip_makeNestedIntArray(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ArrayRoundtrip_roundtripNestedIntArray") public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedIntArray(_: [[Int]].bridgeJSStackPop()) + let values = [[Int]].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripNestedIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2013,7 +2173,9 @@ public func _bjs_ArrayRoundtrip_roundtripNestedIntArray(_ _self: UnsafeMutableRa @_cdecl("bjs_ArrayRoundtrip_takeNestedPointArray") public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeNestedPointArray(_: [[Point]].bridgeJSStackPop()) + let points = [[Point]].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeNestedPointArray(_: points) #else fatalError("Only available on WebAssembly") #endif @@ -2023,7 +2185,8 @@ public func _bjs_ArrayRoundtrip_takeNestedPointArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_makeNestedPointArray") public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeNestedPointArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeNestedPointArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2034,7 +2197,9 @@ public func _bjs_ArrayRoundtrip_makeNestedPointArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_roundtripNestedPointArray") public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripNestedPointArray(_: [[Point]].bridgeJSStackPop()) + let points = [[Point]].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripNestedPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2045,7 +2210,9 @@ public func _bjs_ArrayRoundtrip_roundtripNestedPointArray(_ _self: UnsafeMutable @_cdecl("bjs_ArrayRoundtrip_takeOptionalIntArray") public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalIntArray(_: [Optional].bridgeJSStackPop()) + let values = [Optional].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeOptionalIntArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -2055,7 +2222,8 @@ public func _bjs_ArrayRoundtrip_takeOptionalIntArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_makeOptionalIntArray") public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalIntArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalIntArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2066,7 +2234,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalIntArray(_ _self: UnsafeMutableRawPo @_cdecl("bjs_ArrayRoundtrip_roundtripOptionalIntArray") public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalIntArray(_: [Optional].bridgeJSStackPop()) + let values = [Optional].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripOptionalIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2077,7 +2247,9 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalIntArray(_ _self: UnsafeMutable @_cdecl("bjs_ArrayRoundtrip_takeOptionalPointArray") public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalPointArray(_: [Optional].bridgeJSStackPop()) + let points = [Optional].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeOptionalPointArray(_: points) #else fatalError("Only available on WebAssembly") #endif @@ -2087,7 +2259,8 @@ public func _bjs_ArrayRoundtrip_takeOptionalPointArray(_ _self: UnsafeMutableRaw @_cdecl("bjs_ArrayRoundtrip_makeOptionalPointArray") public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalPointArray() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalPointArray() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2098,7 +2271,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalPointArray(_ _self: UnsafeMutableRaw @_cdecl("bjs_ArrayRoundtrip_roundtripOptionalPointArray") public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalPointArray(_: [Optional].bridgeJSStackPop()) + let points = [Optional].bridgeJSStackPop() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripOptionalPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2109,7 +2284,9 @@ public func _bjs_ArrayRoundtrip_roundtripOptionalPointArray(_ _self: UnsafeMutab @_cdecl("bjs_ArrayRoundtrip_takeOptionalArray") public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ArrayRoundtrip.bridgeJSLiftParameter(_self).takeOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + let values = Optional<[Int]>.bridgeJSLiftParameter() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + _self.takeOptionalArray(_: values) #else fatalError("Only available on WebAssembly") #endif @@ -2119,7 +2296,8 @@ public func _bjs_ArrayRoundtrip_takeOptionalArray(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_ArrayRoundtrip_makeOptionalArraySome") public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArraySome() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalArraySome() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2130,7 +2308,8 @@ public func _bjs_ArrayRoundtrip_makeOptionalArraySome(_ _self: UnsafeMutableRawP @_cdecl("bjs_ArrayRoundtrip_makeOptionalArrayNone") public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).makeOptionalArrayNone() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalArrayNone() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2141,7 +2320,9 @@ public func _bjs_ArrayRoundtrip_makeOptionalArrayNone(_ _self: UnsafeMutableRawP @_cdecl("bjs_ArrayRoundtrip_roundtripOptionalArray") public func _bjs_ArrayRoundtrip_roundtripOptionalArray(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ArrayRoundtrip.bridgeJSLiftParameter(_self).roundtripOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + let values = Optional<[Int]>.bridgeJSLiftParameter() + let _self = ArrayRoundtrip.bridgeJSLiftParameter(_self) + let ret = _self.roundtripOptionalArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -2248,20 +2429,20 @@ func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner") -fileprivate func bjs_benchmarkRunner_extern(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void +fileprivate func bjs_benchmarkRunner_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ body: Int32) -> Void #else -fileprivate func bjs_benchmarkRunner_extern(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void { +fileprivate func bjs_benchmarkRunner_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ body: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_benchmarkRunner(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void { - return bjs_benchmarkRunner_extern(nameBytes, nameLength, body) +@inline(never) fileprivate func bjs_benchmarkRunner(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ body: Int32) -> Void { + return bjs_benchmarkRunner_extern(nameWord0, nameWord1, nameWord2, body) } func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void { - name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in + name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in let bodyValue = body.bridgeJSLowerParameter() - bjs_benchmarkRunner(nameBytes, nameLength, bodyValue) + bjs_benchmarkRunner(nameWord0, nameWord1, nameWord2, bodyValue) } if let error = _swift_js_take_exception() { throw error diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift index 328ae0610..ee8b1f436 100644 --- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift +++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift @@ -179,8 +179,11 @@ public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_PlayBridgeJS_updateDetailed") public func _bjs_PlayBridgeJS_updateDetailed(_ _self: UnsafeMutableRawPointer, _ swiftSourceBytes: Int32, _ swiftSourceLength: Int32, _ dtsSourceBytes: Int32, _ dtsSourceLength: Int32) -> Void { #if arch(wasm32) + let dtsSource = String.bridgeJSLiftParameter(dtsSourceBytes, dtsSourceLength) + let swiftSource = String.bridgeJSLiftParameter(swiftSourceBytes, swiftSourceLength) + let _self = PlayBridgeJS.bridgeJSLiftParameter(_self) do { - let ret = try PlayBridgeJS.bridgeJSLiftParameter(_self).updateDetailed(swiftSource: String.bridgeJSLiftParameter(swiftSourceBytes, swiftSourceLength), dtsSource: String.bridgeJSLiftParameter(dtsSourceBytes, dtsSourceLength)) + let ret = try _self.updateDetailed(swiftSource: swiftSource, dtsSource: dtsSource) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -265,20 +268,20 @@ func _$createTS2Swift() throws(JSException) -> TS2Swift { #if arch(wasm32) @_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Swift_convert") -fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32 +fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsWord0: Int32, _ tsWord1: Int32, _ tsWord2: Int32) -> Int32 #else -fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32 { +fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsWord0: Int32, _ tsWord1: Int32, _ tsWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32 { - return bjs_TS2Swift_convert_extern(self, tsBytes, tsLength) +@inline(never) fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ tsWord0: Int32, _ tsWord1: Int32, _ tsWord2: Int32) -> Int32 { + return bjs_TS2Swift_convert_extern(self, tsWord0, tsWord1, tsWord2) } func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String { - let ret0 = ts.bridgeJSWithLoweredParameter { (tsBytes, tsLength) in + let ret0 = ts.bridgeJSWithLoweredParameter { (tsWord0, tsWord1, tsWord2) in let selfValue = self.bridgeJSLowerParameter() - let ret = bjs_TS2Swift_convert(selfValue, tsBytes, tsLength) + let ret = bjs_TS2Swift_convert(selfValue, tsWord0, tsWord1, tsWord2) return ret } let ret = ret0 diff --git a/Plugins/BridgeJS/README.md b/Plugins/BridgeJS/README.md index 0905695c5..4d93dc875 100644 --- a/Plugins/BridgeJS/README.md +++ b/Plugins/BridgeJS/README.md @@ -139,7 +139,8 @@ The ABI will not be stable, and not meant to be interposed by other tools. Parameter passing follows Wasm calling conventions, with custom handling for complex types: - **Primitives**: Passed directly as Wasm arguments (`i32`, `i64`, `f32`, `f64`) -- **Strings**: UTF-8 bytes stored in `swift.memory`, ID + length passed as Wasm arguments +- **Strings (JS → Swift)**: UTF-8 bytes stored in `swift.memory`, ID + length passed as Wasm arguments +- **Strings (Swift → JS)**: the wasm32 12-byte `String` layout passed as three `i32` words. JS fast-decodes small strings, caches large immortals by a 53-bit `ptr + len` pack when `len < 2**21`, and otherwise reads UTF-8 at `word1 + 20` (`nativeBias`). This layout is a Swift stdlib implementation detail and can change with the toolchain. - **Swift Classes**: Raw Swift heap pointer passed as `i32` - **JSObjects**: Object stored in `swift.memory.heap`, object ID passed as `i32` - **Structs/Arrays**: Fields/elements pushed to type-specific stacks, Swift pops in reverse order @@ -150,7 +151,7 @@ Parameter passing follows Wasm calling conventions, with custom handling for com Return values use direct Wasm returns for primitives, and imported intrinsic functions for complex types: - **Primitives**: Returned directly via Wasm return value -- **Strings**: Swift writes UTF-8 bytes to shared memory, JS decodes +- **Strings**: Swift passes the 12-byte `String` layout; JS decodes (small / immortal-cached / UTF-8) - **Swift Classes**: Pointer returned directly, JS wraps in `SwiftHeapObject` with `FinalizationRegistry` - **Structs/Arrays**: Swift pushes fields/elements to type-specific stacks, JS reconstructs diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift index 969b3c01e..7459d6058 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift @@ -112,11 +112,14 @@ public struct ClosureCodegen { let helperEnumDecl: DeclSyntax = "\(raw: helperEnumDeclPrinter.lines.joined(separator: "\n"))" - let initAccessModifier = accessLevel.modifierKeyword.map { "\($0) " } ?? "" + let accessModifier = accessLevel.modifierKeyword.map { "\($0) " } ?? "" + let declaration = signature.sendingParameters ? "static func sending" : "init" + let returnClause = signature.sendingParameters ? " -> Self" : "" + let initializer = signature.sendingParameters ? "Self" : "self.init" let typedClosureExtension: DeclSyntax = """ extension JSTypedClosure where Signature == \(raw: swiftClosureType) { - \(raw: initAccessModifier)init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping \(raw: swiftClosureType)) { - self.init( + \(raw: accessModifier)\(raw: declaration)(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping \(raw: swiftClosureType))\(raw: returnClause) { + \(raw: initializer)( makeClosure: \(raw: externABIName), body: body, fileID: fileID, @@ -135,149 +138,22 @@ public struct ClosureCodegen { let swiftClosureType = swiftClosureType(for: signature) let boxType = "_BridgeJSTypedClosureBox<\(swiftClosureType)>" let abiName = "invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)" - - // Build ABI parameters directly with WasmCoreType (no string conversion needed) - var abiParams: [(name: String, type: WasmCoreType)] = [("boxPtr", .pointer)] - var liftedParams: [String] = [] - - for (index, paramType) in signature.parameters.enumerated() { - let paramName = "param\(index)" - let liftInfo = try paramType.liftParameterInfo() - - for (argName, wasmType) in liftInfo.parameters { - let fullName = - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - abiParams.append((fullName, wasmType)) - } - - let argNames = liftInfo.parameters.map { (argName, _) in - liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName - } - liftedParams.append( - "\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))" - ) - } - - let tryPrefix = signature.isThrows ? "try " : "" - let closureCallExpr = ExprSyntax("\(raw: tryPrefix)closure(\(raw: liftedParams.joined(separator: ", ")))") - let asyncTryPrefix = (signature.isThrows ? "try " : "") + "await " - let asyncClosureCallExpr = ExprSyntax( - "\(raw: asyncTryPrefix)closure(\(raw: liftedParams.joined(separator: ", ")))" + let builder = try ExportSwift.ExportedThunkBuilder( + effects: Effects(isAsync: signature.isAsync, isThrows: signature.isThrows), + returnType: signature.returnType ) - - let abiReturnWasmType = - signature.isAsync - ? try BridgeType.jsObject(nil).loweringReturnInfo().returnType - : try signature.returnType.loweringReturnInfo().returnType - - // Build signature using SwiftSignatureBuilder - let funcSignature = SwiftSignatureBuilder.buildABIFunctionSignature( - abiParameters: abiParams, - returnType: abiReturnWasmType + builder.abiParameterSignatures.append(("boxPtr", .pointer)) + builder.parameterBindings.append( + "let closure = Unmanaged<\(raw: boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure" ) - - let emitCallAndLower: (CodeFragmentPrinter) -> Void = { printer in - if signature.returnType == .void { - printer.write(closureCallExpr.description) - } else { - printer.write("let result = \(closureCallExpr)") - switch signature.returnType { - case .swiftProtocol: - printer.write( - "return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()" - ) - case .nullable(.swiftProtocol, _): - printer.write("if let result {") - printer.indent { - printer.write( - "_swift_js_return_optional_object(1, (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())" - ) - } - printer.write("} else {") - printer.indent { - printer.write("_swift_js_return_optional_object(0, 0)") - } - printer.write("}") - default: - printer.write("return result.bridgeJSLowerReturn()") - } - } - } - - let emitAsyncCallAndLower: (CodeFragmentPrinter) -> Void = { printer in - printer.write("let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure") - let resolveType = signature.returnType - let resolveName = "Promise_resolve_\(resolveType.mangleTypeName)" - let rejectName = "Promise_reject" - let closureHead: String - if signature.isThrows { - let returnSpelling = resolveType == .void ? "" : " -> \(resolveType.closureSwiftType)" - closureHead = " () async throws(JSException)\(returnSpelling) in" - } else { - closureHead = "" - } - printer.write("return _bjs_makePromise(resolve: \(resolveName), reject: \(rejectName)) {\(closureHead)") - printer.indent { - if resolveType == .void { - printer.write(asyncClosureCallExpr.description) - } else { - printer.write("return \(asyncClosureCallExpr)") - } - } - printer.write("}") - } - - let catchPlaceholderStmt = abiReturnWasmType?.swiftReturnPlaceholderStmt - - // Build function declaration using helper - let funcDecl = SwiftCodePattern.buildExposedFunctionDecl( - abiName: abiName, - signature: funcSignature - ) { printer in - if signature.isAsync { - emitAsyncCallAndLower(printer) - } else if signature.isThrows { - printer.write( - "let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure" - ) - printer.write("do {") - printer.indent { - emitCallAndLower(printer) - } - printer.write("} catch let error {") - printer.indent { - printer.write("if let error = error.thrownValue.object {") - printer.indent { - printer.write("withExtendedLifetime(error) {") - printer.indent { - printer.write("_swift_js_throw(Int32(bitPattern: $0.id))") - } - printer.write("}") - } - printer.write("} else {") - printer.indent { - printer.write("let jsError = JSError(message: error.description)") - printer.write("withExtendedLifetime(jsError.jsObject) {") - printer.indent { - printer.write("_swift_js_throw(Int32(bitPattern: $0.id))") - } - printer.write("}") - } - printer.write("}") - if let catchPlaceholderStmt { - printer.write(catchPlaceholderStmt) - } - } - printer.write("}") - } else { - printer.write( - "let closure = Unmanaged<\(boxType)>.fromOpaque(boxPtr).takeUnretainedValue().closure" - ) - emitCallAndLower(printer) - } + for (index, paramType) in signature.parameters.enumerated() { + try builder.liftParameter( + param: Parameter(label: nil, name: "param\(index)", type: paramType) + ) } - - return DeclSyntax(funcDecl) + builder.call(name: "closure", returnType: signature.returnType) + try builder.lowerReturnValue(returnType: signature.returnType) + return builder.render(abiName: abiName) } public func renderSupport(for skeleton: BridgeJSSkeleton) throws -> String? { diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift index 55b5889fe..3197f559c 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift @@ -179,7 +179,6 @@ public class ExportSwift { class ExportedThunkBuilder { var body: [CodeBlockItemSyntax] = [] - var liftedParameterExprs: [ExprSyntax] = [] var parameters: [Parameter] = [] var abiParameterSignatures: [(name: String, type: WasmCoreType)] = [] var abiReturnType: WasmCoreType? @@ -190,8 +189,7 @@ public class ExportSwift { /// helper. Set for every `async` thunk. var asyncResolveReturnType: BridgeType? - /// Stack-using parameter lifts hoisted ahead of the deferred async closure. - var asyncHoistedBindings: [CodeBlockItemSyntax] = [] + var parameterBindings: [CodeBlockItemSyntax] = [] init(effects: Effects, returnType: BridgeType) throws { self.effects = effects @@ -215,10 +213,11 @@ public class ExportSwift { func liftParameter(param: Parameter) throws { parameters.append(param) + let escapedName = param.escapedSwiftIdentifier let liftingInfo = try param.type.liftParameterInfo() let argumentsToLift: [String] if liftingInfo.parameters.count == 1 { - argumentsToLift = [param.name] + argumentsToLift = [escapedName] } else { argumentsToLift = liftingInfo.parameters.map { (name, _) in param.name + name.capitalizedFirstLetter } } @@ -229,7 +228,9 @@ public class ExportSwift { switch param.type { case .closure(let signature, _): typeNameForIntrinsic = param.type.swiftType - liftingExpr = ExprSyntax("_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: param.name))") + liftingExpr = ExprSyntax( + "_BJS_Closure_\(raw: signature.mangleName).bridgeJSLift(\(raw: escapedName))" + ) case .swiftStruct(let structName): typeNameForIntrinsic = structName liftingExpr = ExprSyntax("\(raw: structName).bridgeJSLiftParameter()") @@ -254,7 +255,7 @@ public class ExportSwift { ) } - liftedParameterExprs.append(liftingExpr) + parameterBindings.insert("let \(raw: param.escapedSwiftBindingIdentifier) = \(liftingExpr)", at: 0) for (name, type) in zip(argumentsToLift, liftingInfo.parameters.map { $0.type }) { abiParameterSignatures.append((name, type)) } @@ -262,22 +263,23 @@ public class ExportSwift { private func protocolCastSuffix(for returnType: BridgeType) -> (prefix: String, suffix: String) { switch returnType { - case .swiftProtocol: - return ("", " as! _BridgedSwiftProtocolExportable") + case .swiftProtocol(let name): + return ("_bridgeJSUnwrapProtocolExportable(", ", \"\(name)\")") default: return ("", "") } } - private func removeFirstLiftedParameter() -> (parameter: Parameter, expr: ExprSyntax) { - let parameter = parameters.removeFirst() - let expr = liftedParameterExprs.removeFirst() - return (parameter, expr) + private func removeFirstLiftedParameter() -> String { + return parameters.removeFirst().escapedSwiftIdentifier } private func renderCallStatement(callee: ExprSyntax, returnType: BridgeType) -> CodeBlockItemSyntax { - let labeledParams = zip(parameters, liftedParameterExprs).map { param, expr in - LabeledExprSyntax(label: param.label, expression: expr) + let labeledParams = parameters.map { param in + LabeledExprSyntax( + label: param.label, + expression: DeclReferenceExprSyntax(baseName: .identifier(param.escapedSwiftIdentifier)) + ) } var callExpr: ExprSyntax = "\(raw: callee)(\(raw: labeledParams.map { $0.description }.joined(separator: ", ")))" @@ -310,7 +312,6 @@ public class ExportSwift { } func call(name: String, returnType: BridgeType) { - generateParameterLifting() let item = renderCallStatement(callee: "\(raw: name)", returnType: returnType) append(item) } @@ -325,8 +326,7 @@ public class ExportSwift { } func callMethod(methodName: String, returnType: BridgeType) { - let (_, selfExpr) = removeFirstLiftedParameter() - generateParameterLifting() + let selfExpr = removeFirstLiftedParameter() let item = renderCallStatement( callee: "\(raw: selfExpr).\(raw: methodName)", returnType: returnType @@ -334,42 +334,8 @@ public class ExportSwift { append(item) } - /// Generates intermediate variables for stack-using parameters if needed for LIFO compatibility - private func generateParameterLifting() { - let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in - param.type.isStackUsingParameter ? index : nil - } - - if effects.isAsync { - // Drain stack parameters before the deferred `Task` or the shared stack is corrupted. - for index in stackParamIndices.reversed() { - let param = parameters[index] - let expr = liftedParameterExprs[index] - let varName = "_tmp_\(param.name)" - var binding: CodeBlockItemSyntax = "let \(raw: varName) = \(expr)" - if !asyncHoistedBindings.isEmpty { - binding = binding.with(\.leadingTrivia, .newline) - } - asyncHoistedBindings.append(binding) - liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName))) - } - return - } - - guard stackParamIndices.count > 1 else { return } - - for index in stackParamIndices.reversed() { - let param = parameters[index] - let expr = liftedParameterExprs[index] - let varName = "_tmp_\(param.name)" - - append("let \(raw: varName) = \(expr)") - liftedParameterExprs[index] = ExprSyntax(DeclReferenceExprSyntax(baseName: .identifier(varName))) - } - } - func callPropertyGetter(propertyName: String, returnType: BridgeType) { - let (_, selfExpr) = removeFirstLiftedParameter() + let selfExpr = removeFirstLiftedParameter() if returnType == .void { append("\(raw: selfExpr).\(raw: propertyName)") } else { @@ -379,13 +345,13 @@ public class ExportSwift { } func callPropertySetter(propertyName: String) { - let (_, selfExpr) = removeFirstLiftedParameter() - let (_, newValueExpr) = removeFirstLiftedParameter() + let selfExpr = removeFirstLiftedParameter() + let newValueExpr = removeFirstLiftedParameter() append("\(raw: selfExpr).\(raw: propertyName) = \(raw: newValueExpr)") } func callStaticPropertySetter(klassName: String, propertyName: String) { - let (_, newValueExpr) = removeFirstLiftedParameter() + let newValueExpr = removeFirstLiftedParameter() append("\(raw: klassName).\(raw: propertyName) = \(raw: newValueExpr)") } @@ -424,11 +390,11 @@ public class ExportSwift { } case .swiftProtocol: append("return ret.bridgeJSLowerAsProtocolReturn()") - case .nullable(.swiftProtocol, _): + case .nullable(.swiftProtocol(let protocolName), _): append( """ if let ret { - _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_return_optional_object(1, _bridgeJSUnwrapProtocolExportable(ret, "\(raw: protocolName)").bridgeJSLowerAsProtocolReturn()) } else { _swift_js_return_optional_object(0, 0) } @@ -456,10 +422,11 @@ public class ExportSwift { /// so the body must also read the captured value. /// See: https://github.com/swiftlang/swift/issues/89320 private var asyncThrowsBodyForcesCapture: Bool { - effects.isThrows && abiParameterSignatures.isEmpty && asyncHoistedBindings.isEmpty + effects.isThrows && parameterBindings.isEmpty } func render(abiName: String) -> DeclSyntax { + var bindings = parameterBindings let body: CodeBlockItemListSyntax if effects.isAsync, let resolveType = asyncResolveReturnType { let resolveName = "Promise_resolve_\(resolveType.mangleTypeName)" @@ -468,17 +435,15 @@ public class ExportSwift { returnSpelling: resolveType.swiftType, forcesCapture: forcesCapture ) - var hoistedBindings = asyncHoistedBindings var bodyItems = self.body if forcesCapture { - hoistedBindings.append("let __bjs_capture = 0") + bindings.append("let __bjs_capture = 0") if !bodyItems.isEmpty { bodyItems[0] = bodyItems[0].with(\.leadingTrivia, .newline) } bodyItems.insert("_ = __bjs_capture", at: 0) } body = """ - \(CodeBlockItemListSyntax(hoistedBindings)) return _bjs_makePromise(resolve: \(raw: resolveName), reject: Promise_reject) {\(raw: closureHead) \(CodeBlockItemListSyntax(bodyItems)) } @@ -504,6 +469,10 @@ public class ExportSwift { } else { body = CodeBlockItemListSyntax(self.body) } + let preparedBody: CodeBlockItemListSyntax = """ + \(CodeBlockItemListSyntax(bindings.map { $0.with(\.leadingTrivia, .newline) })) + \(body) + """ // Build function signature using SwiftSignatureBuilder let signature = SwiftSignatureBuilder.buildABIFunctionSignature( abiParameters: abiParameterSignatures, @@ -515,7 +484,7 @@ public class ExportSwift { abiName: abiName, signature: signature ) { printer in - printer.write(multilineString: body.description) + printer.write(multilineString: preparedBody.description) } return DeclSyntax(funcDecl) @@ -778,9 +747,7 @@ public class ExportSwift { /// public func _bjs_Greeter_greet(pointer: UnsafeMutableRawPointer) -> Void { /// let _self = Unmanaged.fromOpaque(pointer).takeUnretainedValue() /// var ret = _self.greet() - /// return ret.withUTF8 { ptr in - /// _swift_js_return_string(ptr.baseAddress, Int32(ptr.count)) - /// } + /// return ret.bridgeJSLowerReturn() /// } /// @_expose(wasm, "bjs_Greeter_deinit") /// @_cdecl("bjs_Greeter_deinit") @@ -993,9 +960,9 @@ struct StackCodegen { return ["\(raw: accessor).bridgeJSStackPush()"] case .jsObject(_?): return ["\(raw: accessor).jsObject.bridgeJSStackPush()"] - case .swiftProtocol: + case .swiftProtocol(let protocolName): return [ - "_swift_js_push_i32((\(raw: accessor) as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())" + "_swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(\(raw: accessor), \"\(raw: protocolName)\").bridgeJSLowerAsProtocolReturn())" ] case .void, .namespaceEnum: return [] @@ -1016,8 +983,8 @@ struct StackCodegen { varPrefix: String ) -> [CodeBlockItemSyntax] { switch elementType { - case .swiftProtocol: - return lowerProtocolArrayStatements(accessor: accessor, varPrefix: varPrefix) + case .swiftProtocol(let protocolName): + return lowerProtocolArrayStatements(protocolName: protocolName, accessor: accessor, varPrefix: varPrefix) case .void, .namespaceEnum: fatalError("Invalid array element type: \(elementType)") default: @@ -1026,6 +993,7 @@ struct StackCodegen { } private func lowerProtocolArrayStatements( + protocolName: String, accessor: String, varPrefix: String ) -> [CodeBlockItemSyntax] { @@ -1033,7 +1001,7 @@ struct StackCodegen { return [ """ for \(raw: elemVar) in \(raw: accessor) { - _swift_js_push_i32((\(raw: elemVar) as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(\(raw: elemVar), "\(raw: protocolName)").bridgeJSLowerAsProtocolReturn()) } """, "_swift_js_push_i32(Int32(\(raw: accessor).count))", @@ -1048,8 +1016,12 @@ struct StackCodegen { switch valueType { case .jsObject(let className?) where className != "JSObject": return ["\(raw: accessor).mapValues { $0.jsObject }.bridgeJSStackPush()"] - case .swiftProtocol: - return lowerProtocolDictionaryStatements(accessor: accessor, varPrefix: varPrefix) + case .swiftProtocol(let protocolName): + return lowerProtocolDictionaryStatements( + protocolName: protocolName, + accessor: accessor, + varPrefix: varPrefix + ) case .nullable, .closure: return lowerDictionaryStatementsInline( valueType: valueType, @@ -1107,6 +1079,7 @@ struct StackCodegen { } private func lowerProtocolDictionaryStatements( + protocolName: String, accessor: String, varPrefix: String ) -> [CodeBlockItemSyntax] { @@ -1115,7 +1088,7 @@ struct StackCodegen { """ for \(raw: pairVar) in \(raw: accessor) { \(raw: pairVar).key.bridgeJSStackPush() - _swift_js_push_i32((\(raw: pairVar).value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(\(raw: pairVar).value, "\(raw: protocolName)").bridgeJSLowerAsProtocolReturn()) } """, "_swift_js_push_i32(Int32(\(raw: accessor).count))", @@ -1453,7 +1426,7 @@ struct ProtocolCodegen { for method in proto.methods { let builder = try ImportTS.CallJSEmission( moduleName: moduleName, - abiName: "_extern_\(method.name)", + abiName: method.abiName, effects: method.effects, returnType: method.returnType, context: .exportSwift @@ -1469,7 +1442,7 @@ struct ProtocolCodegen { let signature = SwiftSignatureBuilder.buildFunctionSignature( parameters: method.parameters, returnType: method.returnType, - effects: nil + effects: method.effects ) // Build extern declaration using helper function @@ -1478,7 +1451,7 @@ struct ProtocolCodegen { printer: externDeclPrinter, moduleName: moduleName, abiName: method.abiName, - functionName: "_extern_\(method.name)", + functionName: method.abiName, abiParameters: builder.abiParameterSignatures, returnType: builder.abiReturnType ) @@ -1506,32 +1479,34 @@ struct ProtocolCodegen { externDecls.append(contentsOf: propertyExternDecls) } - let structDeclPrinter = CodeFragmentPrinter() - structDeclPrinter.write("struct \(wrapperName): \(protocolName), _BridgedSwiftProtocolWrapper {") - structDeclPrinter.indent { - structDeclPrinter.write("let jsObject: JSObject") - structDeclPrinter.nextLine() - - for methodDecl in methodDecls { - structDeclPrinter.write(lines: methodDecl.lines) - structDeclPrinter.nextLine() - } - - for decl in propertyDecls { - structDeclPrinter.write(lines: decl.lines) - structDeclPrinter.nextLine() + var decls: [DeclSyntax] = [] + if !methodDecls.isEmpty || !propertyDecls.isEmpty { + let extensionPrinter = CodeFragmentPrinter() + extensionPrinter.write("extension \(protocolName) where Self: _BridgedSwiftProtocolWrapper {") + extensionPrinter.indent { + var first = true + for decl in methodDecls + propertyDecls { + if !first { extensionPrinter.nextLine() } + first = false + extensionPrinter.write(lines: decl.lines) + } } - structDeclPrinter.write( - multilineString: """ - static func bridgeJSLiftParameter(_ value: Int32) -> Self { - return \(wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) - } - """ - ) + extensionPrinter.write("}") + decls.append("\(raw: extensionPrinter.lines.joined(separator: "\n"))") } - structDeclPrinter.write("}") - return ["\(raw: structDeclPrinter.lines.joined(separator: "\n"))"] + externDecls + decls.append( + """ + struct \(raw: wrapperName): \(raw: protocolName), _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return \(raw: wrapperName)(jsObject: JSObject(id: UInt32(bitPattern: value))) + } + } + """ + ) + return decls + externDecls } private func renderProtocolProperty( @@ -1738,19 +1713,6 @@ extension BridgeType { return false } - var isStackUsingParameter: Bool { - switch self { - case .swiftStruct, .array, .dictionary, .associatedValueEnum: - return true - case .nullable(let wrapped, _): - return wrapped.isStackUsingParameter - case .alias(_, let underlying): - return underlying.isStackUsingParameter - default: - return false - } - } - struct LiftingIntrinsicInfo: Sendable { let parameters: [(name: String, type: WasmCoreType)] diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift index 33a27d087..b07fada44 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExternalModuleIndex.swift @@ -7,6 +7,7 @@ public struct ExternalModuleIndex { public struct ExternalType: Equatable { public let moduleName: String public let bridgeType: BridgeType + public var isGenericBridgeableProtocol = false } public enum LookupResult: Equatable { @@ -31,8 +32,12 @@ public struct ExternalModuleIndex { guard let exported = skeleton.exported else { continue } var moduleEntries = entriesByModule[moduleName] ?? [:] - func register(dotPath: String, bridgeType: BridgeType) { - let externalType = ExternalType(moduleName: moduleName, bridgeType: bridgeType) + func register(dotPath: String, bridgeType: BridgeType, isGenericBridgeableProtocol: Bool = false) { + let externalType = ExternalType( + moduleName: moduleName, + bridgeType: bridgeType, + isGenericBridgeableProtocol: isGenericBridgeableProtocol + ) if moduleEntries[dotPath] == nil { moduleEntries[dotPath] = externalType entriesByDotPath[dotPath, default: []].append(externalType) @@ -61,7 +66,11 @@ public struct ExternalModuleIndex { register(dotPath: enumDef.swiftCallName, bridgeType: bridgeType) } for proto in exported.protocols { - register(dotPath: proto.name, bridgeType: .swiftProtocol(proto.name)) + register( + dotPath: proto.name, + bridgeType: .swiftProtocol(proto.name), + isGenericBridgeableProtocol: proto.isGenericBridgeable == true + ) } for alias in exported.aliases { register( diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift index cff1aa979..504b955d2 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift @@ -143,7 +143,8 @@ public struct ImportTS { } func lowerParameter(param: Parameter) throws { - if let genericPush = param.type.genericStackPushStatement(value: param.name) { + let escapedName = param.escapedSwiftIdentifier + if let genericPush = param.type.genericStackPushStatement(value: escapedName) { stackLoweringStmts.insert(genericPush, at: 0) return } @@ -153,10 +154,10 @@ public struct ImportTS { switch param.type { case .closure(let signature, useJSTypedClosure: false): let jsTypedClosureType = BridgeType.closure(signature, useJSTypedClosure: true).swiftType - body.write("let \(param.name) = \(jsTypedClosureType)(\(param.name))") + body.write("let \(param.escapedSwiftBindingIdentifier) = \(jsTypedClosureType)(\(escapedName))") // The just created JSObject is not owned by the caller unlike those passed in parameters, // so we need to extend its lifetime during the call to ensure the JSObject.id is valid. - valuesToExtendLifetimeDuringCall.append(param.name) + valuesToExtendLifetimeDuringCall.append(escapedName) default: break } @@ -177,7 +178,7 @@ public struct ImportTS { if loweringInfo.useBorrowing { let returnVariableName = "ret\(borrowedArguments.count)" let assign = needsReturnVariable ? "let \(returnVariableName) = " : "" - body.write("\(assign)\(param.name).bridgeJSWithLoweredParameter { \(pattern) in") + body.write("\(assign)\(escapedName).bridgeJSWithLoweredParameter { \(pattern) in") body.indent() borrowedArguments.append( BorrowedArgument( @@ -188,12 +189,12 @@ public struct ImportTS { } ) ) - } else if case .nullable(.swiftProtocol, _) = param.type, context == .exportSwift { + } else if case .nullable(.swiftProtocol(let protocolName), _) = param.type, context == .exportSwift { body.write("let \(pattern): (Int32, Int32)") - body.write("if let \(param.name) {") + body.write("if let \(param.escapedSwiftBindingIdentifier) {") body.indent { body.write( - "\(pattern) = (1, (\(param.name) as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn())" + "\(pattern) = (1, _bridgeJSUnwrapProtocolExportable(\(escapedName), \"\(protocolName)\").bridgeJSLowerAsProtocolReturn())" ) } body.write("} else {") @@ -203,12 +204,12 @@ public struct ImportTS { body.write("}") } else { let initializerExpr: ExprSyntax - if case .swiftProtocol = param.type, context == .exportSwift { + if case .swiftProtocol(let protocolName) = param.type, context == .exportSwift { initializerExpr = ExprSyntax( - "(\(raw: param.name) as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()" + "_bridgeJSUnwrapProtocolExportable(\(raw: escapedName), \"\(raw: protocolName)\").bridgeJSLowerAsProtocolReturn()" ) } else { - initializerExpr = ExprSyntax("\(raw: param.name).bridgeJSLowerParameter()") + initializerExpr = ExprSyntax("\(raw: escapedName).bridgeJSLowerParameter()") } let binding = loweringInfo.loweredParameters.isEmpty ? "_" : pattern @@ -218,10 +219,10 @@ public struct ImportTS { // Add to signatures and forwardings (unified for both single and multiple) for (index, (paramName, type)) in loweringInfo.loweredParameters.enumerated() { - // For single parameter, use param.name; for multiple, use constructed name + // For single parameter, use the escaped name; for multiple, use constructed name let abiParamName: String if loweringInfo.loweredParameters.count == 1 { - abiParamName = param.name + abiParamName = escapedName } else { abiParamName = "\(param.name)\(paramName.capitalizedFirstLetter)" } @@ -339,7 +340,7 @@ public struct ImportTS { body = CodeFragmentPrinter() let tryKeyword = effects.isThrows ? "try" : "try!" - let rejectFactory = "makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>($0) }" + let rejectFactory = "makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }" if returnType == .void { let resolveFactory = "makeResolveClosure: { JSTypedClosure<() -> Void>($0) }" body.write( @@ -348,7 +349,7 @@ public struct ImportTS { } else { let resolveSwiftType = returnType.closureSwiftType let resolveFactory = - "makeResolveClosure: { JSTypedClosure<(sending \(resolveSwiftType)) -> Void>($0) }" + "makeResolveClosure: { JSTypedClosure<(sending \(resolveSwiftType)) -> Void>.sending($0) }" body.write( "let resolved = \(tryKeyword) await _bjs_awaitPromise(\(resolveFactory), \(rejectFactory)) { resolveRef, rejectRef in" ) @@ -381,7 +382,7 @@ public struct ImportTS { parameters: [Parameter], returnType: BridgeType, effects: Effects, - genericParameters: [String] = [] + genericParameters: [GenericParameter] = [] ) -> DeclSyntax { let printer = CodeFragmentPrinter() let signature = SwiftSignatureBuilder.buildFunctionSignature( @@ -393,7 +394,13 @@ public struct ImportTS { let genericClause = genericParameters.isEmpty ? "" - : "<" + genericParameters.map { "\($0): BridgedSwiftGenericBridgeable" }.joined(separator: ", ") + : "<" + + genericParameters.map { genericParameter in + let constraints = + ["BridgedSwiftGenericBridgeable"] + + (genericParameter.swiftConstraints ?? genericParameter.constraints) + return "\(genericParameter.name): \(constraints.joined(separator: " & "))" + }.joined(separator: ", ") + ">" printer.write("func \(name.backtickIfNeeded())\(genericClause)\(signature) {") printer.indent { @@ -465,7 +472,7 @@ public struct ImportTS { parameters: function.parameters, returnType: function.returnType, effects: function.effects, - genericParameters: function.genericParameterNames + genericParameters: function.genericParameters ?? [] ) .with(\.leadingTrivia, Self.renderDocumentation(documentation: function.documentation)) ] @@ -496,7 +503,7 @@ public struct ImportTS { parameters: [selfParameter] + method.parameters, returnType: method.returnType, effects: method.effects, - genericParameters: method.genericParameterNames + genericParameters: method.genericParameters ?? [] ) ] } @@ -522,7 +529,7 @@ public struct ImportTS { parameters: method.parameters, returnType: method.returnType, effects: method.effects, - genericParameters: method.genericParameterNames + genericParameters: method.genericParameters ?? [] ) ] } @@ -548,7 +555,7 @@ public struct ImportTS { parameters: constructor.parameters, returnType: .jsObject(nil), effects: effects, - genericParameters: constructor.genericParameterNames + genericParameters: constructor.genericParameters ?? [] ) ] } @@ -717,20 +724,21 @@ struct SwiftSignatureBuilder { var out = "(" out += parameters.map { param in let label = param.label ?? param.name + let escapedName = param.escapedSwiftIdentifier let paramType = buildParameterTypeSyntax(from: param.type) if useWildcardLabels { // Always use wildcard labels: "_ name: Type" - return "_ \(param.name): \(paramType)" - } else if label == param.name { + return "_ \(escapedName): \(paramType)" + } else if SwiftToSkeleton.normalizeIdentifier(label) == param.name { // External label same as parameter name: "count: Int" - return "\(param.name): \(paramType)" + return "\(escapedName): \(paramType)" } else if param.label == nil { // No label specified: use wildcard "_ name: Type" - return "_ \(param.name): \(paramType)" + return "_ \(escapedName): \(paramType)" } else { // External label differs: "label count: Int" - return "\(label) \(param.name): \(paramType)" + return "\(label) \(escapedName): \(paramType)" } }.joined(separator: ", ") out += ")" @@ -921,7 +929,7 @@ extension BridgeType { static let float = LoweringParameterInfo(loweredParameters: [("value", .f32)]) static let double = LoweringParameterInfo(loweredParameters: [("value", .f64)]) static let string = LoweringParameterInfo( - loweredParameters: [("bytes", .i32), ("length", .i32)], + loweredParameters: [("word0", .i32), ("word1", .i32), ("word2", .i32)], useBorrowing: true ) static let jsObject = LoweringParameterInfo(loweredParameters: [("value", .i32)]) @@ -1059,3 +1067,13 @@ extension String { return self.isValidSwiftIdentifier(for: .variableName) ? self : "`\(self)`" } } + +extension Parameter { + var escapedSwiftIdentifier: String { + name == "self" ? name : name.backtickIfNeeded() + } + + var escapedSwiftBindingIdentifier: String { + name.backtickIfNeeded() + } +} diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift index fb81d9089..7e075a8af 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift @@ -7,6 +7,11 @@ import BridgeJSUtilities import BridgeJSSkeleton #endif +enum GenericConstraintParseResult { + case parsed(GenericParameter) + case failed(message: String) +} + /// Outcome of attempting to resolve a type as a reference to a generic parameter. enum GenericParameterResolution { case resolved(BridgeType) @@ -295,6 +300,8 @@ public final class SwiftToSkeleton { collector.finalize(&exported) } + perSourceErrors.append(contentsOf: diagnoseProtocolConformances(in: exported)) + if !perSourceErrors.isEmpty { let diagnostics = perSourceErrors.flatMap { inputFilePath, errors in errors.map { (file: inputFilePath, diagnostic: $0) } @@ -318,6 +325,99 @@ public final class SwiftToSkeleton { ) } + private func diagnoseProtocolConformances( + in exported: ExportedSkeleton + ) -> [(inputFilePath: String, errors: [DiagnosticError])] { + var loweredProtocols: Set = [] + func collect(_ type: BridgeType, loweredBySwift: Bool) { + switch type { + case .swiftProtocol(let name): + if loweredBySwift { loweredProtocols.insert(name) } + case .array(let element), .dictionary(let element), .nullable(let element, _), .alias(_, let element): + collect(element, loweredBySwift: loweredBySwift) + case .closure(let signature, _): + for parameter in signature.parameters { + collect(parameter, loweredBySwift: !loweredBySwift) + } + collect(signature.returnType, loweredBySwift: loweredBySwift) + default: + break + } + } + func collect(_ function: ExportedFunction, loweredReturn: Bool = true) { + for parameter in function.parameters { collect(parameter.type, loweredBySwift: !loweredReturn) } + collect(function.returnType, loweredBySwift: loweredReturn) + } + + for function in exported.functions + exported.classes.flatMap(\.methods) + + exported.structs.flatMap(\.methods) + exported.enums.flatMap(\.staticMethods) + { + collect(function) + } + for constructor in exported.classes.compactMap(\.constructor) + exported.structs.compactMap(\.constructor) { + for parameter in constructor.parameters { collect(parameter.type, loweredBySwift: false) } + } + for property in exported.classes.flatMap(\.properties) + exported.enums.flatMap(\.staticProperties) { + collect(property.type, loweredBySwift: true) + if !property.isReadonly { collect(property.type, loweredBySwift: false) } + } + for property in exported.structs.flatMap(\.properties) { + collect(property.type, loweredBySwift: true) + if !property.isStatic || !property.isReadonly { collect(property.type, loweredBySwift: false) } + } + for value in exported.enums.flatMap(\.cases).flatMap(\.associatedValues) { + collect(value.type, loweredBySwift: true) + } + for protocolDef in exported.protocols { + for method in protocolDef.methods { collect(method, loweredReturn: false) } + for property in protocolDef.properties { + collect(property.type, loweredBySwift: false) + if !property.isReadonly { collect(property.type, loweredBySwift: true) } + } + } + + guard !loweredProtocols.isEmpty else { return [] } + var diagnostics: [(inputFilePath: String, errors: [DiagnosticError])] = [] + for declaration in typeDeclResolver.declarationsWithInheritance where !declaration.is(ProtocolDeclSyntax.self) { + let extendedType = declaration.as(ExtensionDeclSyntax.self)?.extendedType + let target = extendedType.flatMap { typeDeclResolver.resolveExtensionTarget($0) } + let classDecl = declaration.as(ClassDeclSyntax.self) ?? target?.as(ClassDeclSyntax.self) + if classDecl?.attributes.hasJSAttribute() == true { continue } + if let extendedType, target == nil { + var errors: [DiagnosticError] = [] + if case .swiftHeapObject = resolveExternal(for: extendedType, errors: &errors) { continue } + } + guard + let name = declaration.asProtocol(NamedDeclSyntax.self)?.name.text ?? extendedType?.trimmedDescription, + let inputFilePath = sourceFiles.first(where: { $0.sourceFile.id == declaration.root.id })?.inputFilePath + else { continue } + for inherited in declaration.inheritanceClause?.inheritedTypes ?? [] { + guard let protocolDecl = typeDeclResolver.resolve(inherited.type)?.as(ProtocolDeclSyntax.self), + protocolDecl.attributes.hasJSAttribute(), loweredProtocols.contains(protocolDecl.name.text) + else { continue } + let protocolName = protocolDecl.name.text + diagnostics.append( + ( + inputFilePath, + [ + DiagnosticError( + node: declaration, + message: + "'\(name)' conforms to '\(protocolName)', a @JS protocol that exported APIs " + + "bridge to JavaScript, but '\(name)' is not a '@JS class'. Passing it to " + + "JavaScript as 'any \(protocolName)' would trap at runtime.", + hint: + "Mark '\(name)' as a '@JS class' so it can cross the bridge, or avoid using " + + "'\(protocolName)' as an existential in exported APIs." + ) + ] + ) + ) + } + } + return diagnostics + } + private static let jsTypedArrayTypealiasNames: [String: String] = [ "Int8": "JSInt8Array", "UInt8": "JSUint8Array", @@ -336,6 +436,21 @@ public final class SwiftToSkeleton { return lookupType(for: attributedType.baseType, errors: &errors) } + // any P + if let existentialType = type.as(SomeOrAnyTypeSyntax.self), + existentialType.someOrAnySpecifier.tokenKind == .keyword(.any) + { + return lookupType(for: existentialType.constraint, errors: &errors) + } + + // (T) + if let tupleType = type.as(TupleTypeSyntax.self), + tupleType.elements.count == 1, + let element = tupleType.elements.first + { + return lookupType(for: element.type, errors: &errors) + } + // JSTypedArray if let identifierType = type.as(IdentifierTypeSyntax.self), identifierType.name.text == "JSTypedArray", @@ -667,6 +782,13 @@ public final class SwiftToSkeleton { } private func resolveExternal(for type: TypeSyntax, errors: inout [DiagnosticError]) -> BridgeType? { + resolveExternalType(for: type, errors: &errors)?.bridgeType + } + + private func resolveExternalType( + for type: TypeSyntax, + errors: inout [DiagnosticError] + ) -> ExternalModuleIndex.ExternalType? { guard !externalModuleIndex.isEmpty, var components = type.qualifiedComponents @@ -692,7 +814,7 @@ public final class SwiftToSkeleton { switch lookupResult { case .unique(let externalType): usedExternalModules.insert(externalType.moduleName) - return externalType.bridgeType + return externalType case .ambiguous(let candidates): let moduleNames = candidates.map(\.moduleName).sorted().joined(separator: ", ") errors.append( @@ -886,11 +1008,94 @@ public final class SwiftToSkeleton { return name.unicodeScalars.dropFirst().allSatisfy { isIdentifierPart($0, isStart: false) } } - fileprivate static func isBridgeableGenericConstraint(_ constraint: String?) -> Bool { + fileprivate static func isBridgeableGenericConstraint(_ constraint: String) -> Bool { constraint == "BridgedSwiftGenericBridgeable" || constraint == "JavaScriptKit.BridgedSwiftGenericBridgeable" } + fileprivate func inheritsGenericBridgeability(for type: TypeSyntax, visited: Set = []) -> Bool { + if Self.isBridgeableGenericConstraint(type.trimmedDescription) { return true } + if let proto = typeDeclResolver.resolve(type)?.as(ProtocolDeclSyntax.self) { + guard !visited.contains(proto.id) else { return false } + return (proto.inheritanceClause?.inheritedTypes ?? []).contains { + inheritsGenericBridgeability(for: $0.type, visited: visited.union([proto.id])) + } + } + var errors: [DiagnosticError] = [] + return resolveExternalType(for: type, errors: &errors)?.isGenericBridgeableProtocol == true + } + + fileprivate func resolveJSProtocolConstraint(for type: TypeSyntax) -> String? { + if let typeDecl = typeDeclResolver.resolve(type) { + guard let protocolDecl = typeDecl.as(ProtocolDeclSyntax.self), + protocolDecl.attributes.hasJSAttribute() + else { + return nil + } + return protocolDecl.name.text + } + var scratchErrors: [DiagnosticError] = [] + if let externalType = resolveExternal(for: type, errors: &scratchErrors), + case .swiftProtocol(let name) = externalType + { + return name + } + return nil + } + + fileprivate func parseGenericParameterConstraints( + _ genericParam: GenericParameterSyntax, + attributeName: String + ) -> GenericConstraintParseResult { + let paramName = genericParam.name.text + guard let inheritedType = genericParam.inheritedType else { + return .failed( + message: + "Generic parameter '\(paramName)' must be constrained to 'BridgedSwiftGenericBridgeable' to be used with \(attributeName)." + ) + } + let elements: [TypeSyntax] + if let composition = inheritedType.as(CompositionTypeSyntax.self) { + elements = composition.elements.map { TypeSyntax($0.type) } + } else { + elements = [inheritedType] + } + var hasBridgeableConstraint = false + var constraints: [String] = [] + var swiftConstraints: [String] = [] + for element in elements { + if SwiftToSkeleton.isBridgeableGenericConstraint(element.trimmedDescription) { + hasBridgeableConstraint = true + continue + } + guard let protocolName = resolveJSProtocolConstraint(for: element) else { + return .failed( + message: + "Generic parameter '\(paramName)' has unsupported constraint '\(element.trimmedDescription)'. " + + "Constraints on generic \(attributeName) declarations must be 'BridgedSwiftGenericBridgeable', " + + "optionally composed with '@JS' protocols (e.g. '\(paramName): BridgedSwiftGenericBridgeable & MyProtocol')." + ) + } + hasBridgeableConstraint = hasBridgeableConstraint || inheritsGenericBridgeability(for: element) + if !constraints.contains(protocolName) { + constraints.append(protocolName) + } + let swiftConstraint = element.is(MemberTypeSyntax.self) ? element.trimmedDescription : protocolName + if !swiftConstraints.contains(swiftConstraint) { + swiftConstraints.append(swiftConstraint) + } + } + guard hasBridgeableConstraint else { + let suggested = (["BridgedSwiftGenericBridgeable"] + swiftConstraints).joined(separator: " & ") + return .failed( + message: + "Generic parameter '\(paramName)' is missing the 'BridgedSwiftGenericBridgeable' constraint. " + + "Write '\(paramName): \(suggested)' to combine it with '@JS' protocol constraints on \(attributeName) declarations." + ) + } + return .parsed(GenericParameter(name: paramName, constraints: constraints, swiftConstraints: swiftConstraints)) + } + } private enum ExportSwiftConstants { @@ -973,6 +1178,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { struct NamespaceResolution { let namespace: [String]? + var jsNamespace: [String]? = nil let isValid: Bool } @@ -984,7 +1190,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { declarationType: String ) -> NamespaceResolution { let attributeNamespace = extractNamespace(from: jsAttribute) - let computedNamespace = computeNamespace(for: node) + let computedNamespace = computeNamespace(for: node, includeParentTypes: true) if computedNamespace != nil && attributeNamespace != nil { diagnose( @@ -996,7 +1202,12 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return NamespaceResolution(namespace: nil, isValid: false) } - return NamespaceResolution(namespace: computedNamespace ?? attributeNamespace, isValid: true) + let jsNamespace = computeNamespace(for: node, includeParentTypes: true, useJSNames: true) + return NamespaceResolution( + namespace: computedNamespace ?? attributeNamespace, + jsNamespace: jsNamespace != computedNamespace ? jsNamespace : nil, + isValid: true + ) } enum State { @@ -1193,10 +1404,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { switch type { case .swiftStruct(let name), .nullable(.swiftStruct(let name), _): isStructType = true - expectedTypeName = name.split(separator: ".").last.map(String.init) + expectedTypeName = name case .swiftHeapObject(let name), .nullable(.swiftHeapObject(let name), _): isStructType = false - expectedTypeName = name.split(separator: ".").last.map(String.init) + expectedTypeName = name default: diagnose( node: funcCall, @@ -1206,7 +1417,9 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return nil } - guard let expectedTypeName = expectedTypeName, typeName == expectedTypeName else { + guard let expectedTypeName = expectedTypeName, + typeName == expectedTypeName.split(separator: ".").last.map(String.init) + else { diagnose( node: funcCall, message: "Constructor type name '\(typeName)' doesn't match parameter type", @@ -1240,7 +1453,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .structLiteral(typeName, fields) } else { if funcCall.arguments.isEmpty { - return .object(typeName) + return .object(expectedTypeName) } var constructorArgs: [DefaultValue] = [] @@ -1255,7 +1468,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { } constructorArgs.append(argValue) } - return .objectWithArguments(typeName, constructorArgs) + return .objectWithArguments(expectedTypeName, constructorArgs) } } @@ -1374,7 +1587,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { continue } - let name = param.secondName?.text ?? param.firstName.text + let name = SwiftToSkeleton.normalizeIdentifier(param.secondName?.text ?? param.firstName.text) let label = param.firstName.text let defaultValue: DefaultValue? @@ -1773,6 +1986,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard let effects = collectEffects(signature: node.signature) else { return .skipChildren } + if effects.isAsync || effects.isThrows { + diagnose( + node: node, + message: "@JS struct initializer cannot be async or throw", + hint: "BridgeJS calls this initializer to rebuild struct values passed from JavaScript" + ) + return .skipChildren + } let structAbiName = exportedStructByName[structKey]?.abiName ?? "unknown" let constructor = ExportedConstructor( @@ -1922,7 +2143,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .skipChildren } - diagnoseUnsupportedJSName(from: jsAttribute) + let jsName = extractValidatedJSName(from: jsAttribute) if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) { recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget) @@ -1933,10 +2154,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard namespaceResult.isValid else { return .skipChildren } - let effectiveNamespace = effectiveNamespace( - resolvedNamespace: namespaceResult.namespace, - parentTypeNamespace: computeParentTypeNamespace(for: node) - ) + let effectiveNamespace = namespaceResult.namespace let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name) let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( for: node, @@ -1946,12 +2164,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let isFinal = node.modifiers.contains { $0.name.tokenKind == .keyword(.final) } ? true : nil let exportedClass = ExportedClass( name: name, + jsName: jsName, swiftCallName: swiftCallName, explicitAccessControl: explicitAccessControl, constructor: nil, methods: [], properties: [], namespace: effectiveNamespace, + jsNamespace: namespaceResult.jsNamespace, identityMode: classIdentityMode, documentation: extractDocumentation(from: node), isFinal: isFinal @@ -2031,6 +2251,14 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { aliasTarget: TypeSyntax ) { let swiftCallName = parent.computeSwiftCallName(for: node, itemName: node.name.text) + if extractJSName(from: jsAttribute) != nil { + diagnose( + node: jsAttribute, + message: "A separate name for JavaScript is not supported on `@JS(as:)` types", + hint: "Remove the name argument; an alias adopts its target's representation" + ) + return + } if extractNamespace(from: jsAttribute) != nil { errors.append( DiagnosticError( @@ -2072,7 +2300,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .skipChildren } - diagnoseUnsupportedJSName(from: jsAttribute) + let jsName = extractValidatedJSName(from: jsAttribute) if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) { recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget) @@ -2090,10 +2318,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard namespaceResult.isValid else { return .skipChildren } - let effectiveNamespace = effectiveNamespace( - resolvedNamespace: namespaceResult.namespace, - parentTypeNamespace: computeParentTypeNamespace(for: node) - ) + let effectiveNamespace = namespaceResult.namespace let emitStyle = extractEnumStyle(from: jsAttribute) ?? .const let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name) let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( @@ -2101,22 +2326,16 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { message: "Enum visibility must be at least internal" ) - let tsFullPath: String - if let namespace = effectiveNamespace, !namespace.isEmpty { - tsFullPath = namespace.joined(separator: ".") + "." + name - } else { - tsFullPath = name - } - // Create enum directly in dictionary let exportedEnum = ExportedEnum( name: name, + jsName: jsName, swiftCallName: swiftCallName, - tsFullPath: tsFullPath, explicitAccessControl: explicitAccessControl, cases: [], // Will be populated in visit(EnumCaseDeclSyntax) rawType: SwiftEnumRawType(rawType), namespace: effectiveNamespace, + jsNamespace: namespaceResult.jsNamespace, emitStyle: emitStyle, staticMethods: [], staticProperties: [], @@ -2199,7 +2418,12 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .skipChildren } - diagnoseUnsupportedJSName(from: jsAttribute) + let jsName = extractValidatedJSName(from: jsAttribute) + + if let aliasTarget = parent.extractAliasTarget(from: jsAttribute), jsName != nil { + recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget) + return .skipChildren + } let name = node.name.text @@ -2207,10 +2431,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard namespaceResult.isValid else { return .skipChildren } - let effectiveNamespace = effectiveNamespace( - resolvedNamespace: namespaceResult.namespace, - parentTypeNamespace: computeParentTypeNamespace(for: node) - ) + let effectiveNamespace = namespaceResult.namespace _ = computeExplicitAtLeastInternalAccessControl( for: node, message: "Protocol visibility must be at least internal" @@ -2218,11 +2439,30 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let protocolUniqueKey = makeKey(name: name, namespace: effectiveNamespace) + var inheritedJSProtocols: [String] = [] + for inherited in node.inheritanceClause?.inheritedTypes ?? [] { + guard let baseName = parent.resolveJSProtocolConstraint(for: inherited.type) else { continue } + guard parent.typeDeclResolver.resolve(inherited.type)?.is(ProtocolDeclSyntax.self) == true else { + diagnose( + node: inherited, + message: "Refining @JS protocol '\(baseName)' from another module is not supported yet.", + hint: + "Declare the inherited requirements on '\(name)' directly, or move the base protocol into this module." + ) + return .skipChildren + } + if !inheritedJSProtocols.contains(baseName) { + inheritedJSProtocols.append(baseName) + } + } + exportedProtocolByName[protocolUniqueKey] = ExportedProtocol( name: name, + jsName: jsName, methods: [], properties: [], namespace: effectiveNamespace, + jsNamespace: namespaceResult.jsNamespace, documentation: extractDocumentation(from: node) ) @@ -2245,10 +2485,16 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let exportedProtocol = ExportedProtocol( name: name, + jsName: jsName, methods: methods, properties: exportedProtocolByName[protocolUniqueKey]?.properties ?? [], namespace: effectiveNamespace, - documentation: extractDocumentation(from: node) + jsNamespace: namespaceResult.jsNamespace, + documentation: extractDocumentation(from: node), + inheritedJSProtocols: inheritedJSProtocols.isEmpty ? nil : inheritedJSProtocols, + isGenericBridgeable: (node.inheritanceClause?.inheritedTypes ?? []).contains { + parent.inheritsGenericBridgeability(for: $0.type) + } ? true : nil ) exportedProtocolByName[protocolUniqueKey] = exportedProtocol @@ -2264,7 +2510,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .skipChildren } - diagnoseUnsupportedJSName(from: jsAttribute) + let jsName = extractValidatedJSName(from: jsAttribute) if let aliasTarget = parent.extractAliasTarget(from: jsAttribute) { recordAlias(node: node, jsAttribute: jsAttribute, aliasTarget: aliasTarget) @@ -2277,10 +2523,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { guard namespaceResult.isValid else { return .skipChildren } - let effectiveNamespace = effectiveNamespace( - resolvedNamespace: namespaceResult.namespace, - parentTypeNamespace: computeParentTypeNamespace(for: node) - ) + let effectiveNamespace = namespaceResult.namespace let swiftCallName = parent.computeSwiftCallName(for: node, itemName: name) let explicitAccessControl = computeExplicitAtLeastInternalAccessControl( for: node, @@ -2342,11 +2585,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { let structUniqueKey = makeKey(name: name, namespace: effectiveNamespace) let exportedStruct = ExportedStruct( name: name, + jsName: jsName, swiftCallName: swiftCallName, explicitAccessControl: explicitAccessControl, properties: properties, methods: [], namespace: effectiveNamespace, + jsNamespace: namespaceResult.jsNamespace, documentation: extractDocumentation(from: node) ) @@ -2500,9 +2745,11 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { currentProtocol = ExportedProtocol( name: currentProtocol.name, + jsName: currentProtocol.jsName, methods: currentProtocol.methods, properties: properties, namespace: currentProtocol.namespace, + jsNamespace: currentProtocol.jsNamespace, documentation: currentProtocol.documentation ) exportedProtocolByName[protocolKey] = currentProtocol @@ -2589,61 +2836,44 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor { return .visitChildren } - /// Computes namespace by walking up the AST hierarchy to find parent namespace enums - /// If parent enum is a namespace enum (no cases) then it will be used as part of namespace for given node - /// - /// - /// Method allows for explicit namespace for top level enum, it will be used as base namespace and will concat enum name - private func computeNamespace(for node: some SyntaxProtocol) -> [String]? { + /// Computes inherited namespaces using Swift names for ABI generation or public names for exports. + private func computeNamespace( + for node: some SyntaxProtocol, + includeParentTypes: Bool = false, + useJSNames: Bool = false + ) -> [String]? { var namespace: [String] = [] for declaration in parent.enclosingDeclarations(of: node) { + let name: String + let jsAttribute: AttributeSyntax if let enumDecl = declaration.as(EnumDeclSyntax.self), - enumDecl.attributes.hasJSAttribute() + let attribute = enumDecl.attributes.firstJSAttribute, + !enumDecl.memberBlock.members.contains(where: { $0.decl.is(EnumCaseDeclSyntax.self) }) { - let isNamespaceEnum = !enumDecl.memberBlock.members.contains { member in - member.decl.is(EnumCaseDeclSyntax.self) - } - if isNamespaceEnum { - namespace.insert(enumDecl.name.text, at: 0) - - if let jsAttribute = enumDecl.attributes.firstJSAttribute, - let explicitNamespace = extractNamespace(from: jsAttribute) - { - namespace = explicitNamespace + namespace - break - } - } - } - } - - return namespace.isEmpty ? nil : namespace - } - - private func computeParentTypeNamespace(for node: some SyntaxProtocol) -> [String]? { - var path: [String] = [] - - for declaration in parent.enclosingDeclarations(of: node) { - if let structDecl = declaration.as(StructDeclSyntax.self), - structDecl.attributes.hasJSAttribute() + name = enumDecl.name.text + jsAttribute = attribute + } else if includeParentTypes, let structDecl = declaration.as(StructDeclSyntax.self), + let attribute = structDecl.attributes.firstJSAttribute { - path.insert(structDecl.name.text, at: 0) - } else if let classDecl = declaration.as(ClassDeclSyntax.self), - classDecl.attributes.hasJSAttribute() + name = structDecl.name.text + jsAttribute = attribute + } else if includeParentTypes, let classDecl = declaration.as(ClassDeclSyntax.self), + let attribute = classDecl.attributes.firstJSAttribute { - path.insert(classDecl.name.text, at: 0) + name = classDecl.name.text + jsAttribute = attribute + } else { + continue + } + namespace.insert(useJSNames ? extractJSName(from: jsAttribute) ?? name : name, at: 0) + if let explicitNamespace = extractNamespace(from: jsAttribute) { + namespace = explicitNamespace + namespace + break } } - return path.isEmpty ? nil : path - } - - private func effectiveNamespace( - resolvedNamespace: [String]?, - parentTypeNamespace: [String]? - ) -> [String]? { - let combined = (parentTypeNamespace ?? []) + (resolvedNamespace ?? []) - return combined.isEmpty ? nil : combined + return namespace.isEmpty ? nil : namespace } /// Requires the node to have at least internal access control. @@ -3362,27 +3592,21 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { /// /// Returns `nil` when a diagnostic was emitted; an empty array when the /// declaration is not generic. - private func parseGenericParameterNames( + private func parseGenericParameters( genericParameterClause: GenericParameterClauseSyntax?, genericWhereClause: GenericWhereClauseSyntax?, node: Syntax - ) -> [String]? { - var genericParameterNames: [String] = [] + ) -> [GenericParameter]? { + var genericParameters: [GenericParameter] = [] if let genericParameterClause { for genericParam in genericParameterClause.parameters { - let paramName = genericParam.name.text - let constraintText = genericParam.inheritedType?.trimmedDescription - guard SwiftToSkeleton.isBridgeableGenericConstraint(constraintText) else { - errors.append( - DiagnosticError( - node: Syntax(genericParam), - message: - "Generic parameter '\(paramName)' must be constrained to 'BridgedSwiftGenericBridgeable' to be used with @JSFunction." - ) - ) + switch parent.parseGenericParameterConstraints(genericParam, attributeName: "@JSFunction") { + case .failed(let message): + errors.append(DiagnosticError(node: Syntax(genericParam), message: message)) return nil + case .parsed(let genericParameter): + genericParameters.append(genericParameter) } - genericParameterNames.append(paramName) } } if genericWhereClause != nil { @@ -3394,7 +3618,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { ) return nil } - return genericParameterNames + return genericParameters } private func parseConstructor( @@ -3411,7 +3635,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } guard - let genericParameterNames = parseGenericParameterNames( + let genericParameters = parseGenericParameters( genericParameterClause: initializer.genericParameterClause, genericWhereClause: initializer.genericWhereClause, node: Syntax(initializer) @@ -3419,6 +3643,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { else { return nil } + let genericParameterNames = genericParameters.map(\.name) if !genericParameterNames.isEmpty && effects.isAsync { errors.append( DiagnosticError( @@ -3451,7 +3676,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return ImportedConstructorSkeleton( parameters: parameters, accessLevel: accessLevel, - genericParameters: genericParameterNames.isEmpty ? nil : genericParameterNames + genericParameters: genericParameters.isEmpty ? nil : genericParameters ) } @@ -3470,7 +3695,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { } guard - let genericParameterNames = parseGenericParameterNames( + let genericParameters = parseGenericParameters( genericParameterClause: node.genericParameterClause, genericWhereClause: node.genericWhereClause, node: Syntax(node) @@ -3479,6 +3704,8 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { return nil } + let genericParameterNames = genericParameters.map(\.name) + let baseName = SwiftToSkeleton.normalizeIdentifier(node.name.text) let extractedJSName = extractJSName(from: jsFunction) let from = extractJSImportFrom(from: jsFunction) @@ -3541,7 +3768,7 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor { effects: effects, documentation: nil, accessLevel: accessLevel, - genericParameters: genericParameterNames.isEmpty ? nil : genericParameterNames + genericParameters: genericParameters.isEmpty ? nil : genericParameters ) } diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift index 4df546b8a..f88f67084 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift @@ -9,6 +9,7 @@ class TypeDeclResolver { typealias QualifiedName = [String] private var typeDeclByQualifiedName: [QualifiedName: TypeDecl] = [:] private var typeAliasByQualifiedName: [QualifiedName: TypeAliasDeclSyntax] = [:] + private(set) var declarationsWithInheritance: [any DeclGroupSyntax] = [] enum Error: Swift.Error { case typeNotFound(QualifiedName) @@ -24,6 +25,9 @@ class TypeDeclResolver { } func visitNominalDecl(_ node: TypeDecl) -> SyntaxVisitorContinueKind { + if node.inheritanceClause != nil { + resolver.declarationsWithInheritance.append(node) + } let name = node.name.text let qualifiedName = scope + [name] resolver.typeDeclByQualifiedName[qualifiedName] = node @@ -74,6 +78,9 @@ class TypeDeclResolver { } override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind { + if node.inheritanceClause != nil { + resolver.declarationsWithInheritance.append(node) + } guard let components = node.memberScopeComponents else { return .skipChildren } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift index 163b7db6b..82150d065 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift @@ -226,7 +226,7 @@ public struct BridgeJSLink { } } - for structDefinition in skeleton.structs where structDefinition.namespace == nil { + for structDefinition in skeleton.structs where structDefinition.resolvedJSNamespace == nil { data.topLevelDtsTypeLines.append( contentsOf: renderExportedStructInterface(structDefinition) ) @@ -313,13 +313,178 @@ public struct BridgeJSLink { return data } + /// Emits `decodeString`, including small-string helpers used only by it. + /// + /// The wasm32 12-byte Swift `String` layout is a standard-library + /// implementation detail, not a stable ABI. Small strings (`word2 & 0x2000`) + /// store up to 8 UTF-8 bytes inline. Large strings store the UTF-8 count in + /// `word0` and a variant/object pointer in `word1`; UTF-8 starts at + /// `word1 + nativeBias` (20 on 32-bit). Immortal large strings + /// (`word2 & 0x8000`) are cached by a 53-bit `ptr + len * 2**32` key when + /// `len < 2**21`; longer immortals skip the cache. + private func emitDecodeString(_ printer: CodeFragmentPrinter) { + printer.write( + multilineString: """ + \(JSGlueVariableScope.reservedDecodeString) = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return \(JSGlueVariableScope.reservedDecodeUTF8)(ptr, len); + const key = ptr + len * 0x100000000; + const cached = \(JSGlueVariableScope.reservedImmortalStrings).get(key); + if (cached !== undefined) return cached; + const value = \(JSGlueVariableScope.reservedDecodeUTF8)(ptr, len); + \(JSGlueVariableScope.reservedImmortalStrings).set(key, value); + return value; + }; + })(); + """ + ) + } + private func generateVariableDeclarations() -> [String] { var declarations: [String] = [ "let \(JSGlueVariableScope.reservedInstance);", "let \(JSGlueVariableScope.reservedMemory);", "let \(JSGlueVariableScope.reservedSetException);", "let \(JSGlueVariableScope.reservedDecodeString);", - "const \(JSGlueVariableScope.reservedTextDecoder) = new TextDecoder(\"utf-8\");", + "let \(JSGlueVariableScope.reservedDecodeUTF8);", + "const \(JSGlueVariableScope.reservedImmortalStrings) = new Map();", + "const \(JSGlueVariableScope.reservedTextDecoder) = new TextDecoder(\"utf-8\", { ignoreBOM: true });", "const \(JSGlueVariableScope.reservedTextEncoder) = new TextEncoder(\"utf-8\");", "let \(JSGlueVariableScope.reservedStorageToReturnString);", "let \(JSGlueVariableScope.reservedStorageToReturnBytes);", @@ -405,7 +570,6 @@ public struct BridgeJSLink { scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry), printer: printer, hasDirectAccessToSwiftClass: false, - classNamespaces: intrinsicRegistry.classNamespaces ) } @@ -496,10 +660,10 @@ public struct BridgeJSLink { "const imports = options.getImports(importsContext);" ]) } - printer.write("bjs[\"swift_js_return_string\"] = function(ptr, len) {") + printer.write("bjs[\"swift_js_return_string\"] = function(word0, word1, word2) {") printer.indent { printer.write( - "\(JSGlueVariableScope.reservedStorageToReturnString) = \(JSGlueVariableScope.reservedDecodeString)(ptr, len);" + "\(JSGlueVariableScope.reservedStorageToReturnString) = \(JSGlueVariableScope.reservedDecodeString)(word0, word1, word2);" ) } printer.write("}") @@ -517,10 +681,10 @@ public struct BridgeJSLink { printer.write("bytes.set(source);") } printer.write("}") - printer.write("bjs[\"swift_js_make_js_string\"] = function(ptr, len) {") + printer.write("bjs[\"swift_js_make_js_string\"] = function(word0, word1, word2) {") printer.indent { printer.write( - "return \(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).retain(\(JSGlueVariableScope.reservedDecodeString)(ptr, len));" + "return \(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).retain(\(JSGlueVariableScope.reservedDecodeString)(word0, word1, word2));" ) } printer.write("}") @@ -567,9 +731,11 @@ public struct BridgeJSLink { printer.write("\(JSGlueVariableScope.reservedF64Stack).push(v);") } printer.write("}") - printer.write("bjs[\"swift_js_push_string\"] = function(ptr, len) {") + printer.write("bjs[\"swift_js_push_string\"] = function(word0, word1, word2) {") printer.indent { - printer.write("const value = \(JSGlueVariableScope.reservedDecodeString)(ptr, len);") + printer.write( + "const value = \(JSGlueVariableScope.reservedDecodeString)(word0, word1, word2);" + ) printer.write("\(JSGlueVariableScope.reservedStringStack).push(value);") } printer.write("}") @@ -616,9 +782,10 @@ public struct BridgeJSLink { printer.indent { printer.write("const Ctor = taCtors[kind];") printer.write("const byteLen = count * Ctor.BYTES_PER_ELEMENT;") + printer.write("const start = ptr >>> 0;") // slice() copies the bytes into a new ArrayBuffer that is properly aligned printer.write( - "const copy = \(JSGlueVariableScope.reservedMemory).buffer.slice(ptr, ptr + byteLen);" + "const copy = \(JSGlueVariableScope.reservedMemory).buffer.slice(start, start + byteLen);" ) printer.write("\(JSGlueVariableScope.reservedTaStack).push(Array.from(new Ctor(copy)));") } @@ -733,7 +900,7 @@ public struct BridgeJSLink { printer.write("}") } printer.write("}") - printer.write("bjs[\"swift_js_return_optional_string\"] = function(isSome, ptr, len) {") + printer.write("bjs[\"swift_js_return_optional_string\"] = function(isSome, word0, word1, word2) {") printer.indent { printer.write("if (isSome === 0) {") printer.indent { @@ -742,7 +909,7 @@ public struct BridgeJSLink { printer.write("} else {") printer.indent { printer.write(lines: [ - "\(JSGlueVariableScope.reservedStorageToReturnString) = \(JSGlueVariableScope.reservedDecodeString)(ptr, len);" + "\(JSGlueVariableScope.reservedStorageToReturnString) = \(JSGlueVariableScope.reservedDecodeString)(word0, word1, word2);" ]) } printer.write("}") @@ -880,7 +1047,7 @@ public struct BridgeJSLink { helperPrinter.write("let length = 0;") helperPrinter.write("while (bytes[length] !== 0) { length += 1; }") helperPrinter.write( - "const fileID = \(JSGlueVariableScope.reservedDecodeString)(state.file, length);" + "const fileID = \(JSGlueVariableScope.reservedDecodeUTF8)(state.file, length);" ) helperPrinter.write( "throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`);" @@ -1022,7 +1189,10 @@ public struct BridgeJSLink { for skeleton in exportedSkeletons { for proto in skeleton.protocols { printer.write(lines: renderJSDoc(documentation: proto.documentation, parameters: [])) - printer.write("export interface \(proto.name) {") + let extendsClause = + inheritedProtocolTSNames(of: proto, in: exportedSkeletons) + .map { " extends \($0.joined(separator: ", "))" } ?? "" + printer.write("export interface \(proto.resolvedJSName)\(extendsClause) {") printer.indent { for method in proto.methods { printer.write( @@ -1057,7 +1227,7 @@ public struct BridgeJSLink { // Use fully-qualified path for namespaced enums let fullEnumValuesPath: String - if let namespace = enumDefinition.namespace, !namespace.isEmpty { + if let namespace = enumDefinition.resolvedJSNamespace, !namespace.isEmpty { fullEnumValuesPath = namespace.joined(separator: ".") + "." + enumValuesName } else { fullEnumValuesPath = enumValuesName @@ -1134,7 +1304,7 @@ public struct BridgeJSLink { renderPropertyEntry: { property in let readonly = property.isReadonly ? "readonly " : "" return self.renderJSDoc(documentation: property.documentation, parameters: []) - + ["\(readonly)\(property.resolvedJSName): \(property.type.tsType);"] + + ["\(readonly)\(property.resolvedJSName): \(self.resolveTypeScriptType(property.type));"] } ) printer.write("export type Exports = {") @@ -1226,7 +1396,6 @@ public struct BridgeJSLink { scope: structScope, printer: structPrinter, hasDirectAccessToSwiftClass: false, - classNamespaces: intrinsicRegistry.classNamespaces ) ) bodyPrinter.write(lines: structPrinter.lines) @@ -1248,7 +1417,6 @@ public struct BridgeJSLink { scope: enumScope, printer: enumPrinter, hasDirectAccessToSwiftClass: false, - classNamespaces: intrinsicRegistry.classNamespaces ) ) bodyPrinter.write(lines: enumPrinter.lines) @@ -1289,19 +1457,21 @@ public struct BridgeJSLink { printer.write("setInstance: (i) => {") printer.indent { printer.write(lines: [ + "if (\(JSGlueVariableScope.reservedMemory) !== i.exports.memory) \(JSGlueVariableScope.reservedImmortalStrings).clear();", "\(JSGlueVariableScope.reservedInstance) = i;", "\(JSGlueVariableScope.reservedMemory) = \(JSGlueVariableScope.reservedInstance).exports.memory;", ]) printer.nextLine() if sharedMemory { printer.write( - "\(JSGlueVariableScope.reservedDecodeString) = (ptr, len) => { const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0).slice(); return \(JSGlueVariableScope.reservedTextDecoder).decode(bytes); }" + "\(JSGlueVariableScope.reservedDecodeUTF8) = (ptr, len) => { const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0).slice(); return \(JSGlueVariableScope.reservedTextDecoder).decode(bytes); }" ) } else { printer.write( - "\(JSGlueVariableScope.reservedDecodeString) = (ptr, len) => { const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0); return \(JSGlueVariableScope.reservedTextDecoder).decode(bytes); }" + "\(JSGlueVariableScope.reservedDecodeUTF8) = (ptr, len) => { const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, ptr >>> 0, len >>> 0); return \(JSGlueVariableScope.reservedTextDecoder).decode(bytes); }" ) } + emitDecodeString(printer) printer.nextLine() // Error handling printer.write("\(JSGlueVariableScope.reservedSetException) = (error) => {") @@ -1348,12 +1518,14 @@ public struct BridgeJSLink { public func link(sharedMemory: Bool = false) throws -> (outputJs: String, outputDts: String) { intrinsicRegistry.reset() importedModuleRegistry.configure(skeletons: skeletons) - intrinsicRegistry.classNamespaces = skeletons.reduce(into: [:]) { result, unified in - guard let skeleton = unified.exported else { return } - for klass in skeleton.classes { - if let namespace = klass.namespace { - result[klass.name] = namespace - } + intrinsicRegistry.classPaths = skeletons.reduce(into: [:]) { result, unified in + for klass in unified.exported?.classes ?? [] { + result[klass.swiftCallName] = klass.tsPathComponents + } + } + intrinsicRegistry.renamedEnumNames = skeletons.reduce(into: [:]) { result, unified in + for enumDef in unified.exported?.enums ?? [] where enumDef.resolvedJSName != enumDef.name { + result[enumDef.swiftCallName] = (value: enumDef.valuesName, type: enumDef.resolvedJSName) } } intrinsicRegistry.typeOwnerModules = collectTypeOwnerModules() @@ -1454,9 +1626,10 @@ public struct BridgeJSLink { for klass in classes.sorted(by: { $0.name < $1.name }) { let wrapperFunctionName = "bjs_\(klass.abiName)_wrap" - let namespacePath = (klass.namespace ?? []).map { ".\($0)" }.joined() + let namespacePath = (klass.resolvedJSNamespace ?? []).map { ".\($0)" }.joined() let exportsPath = - namespacePath.isEmpty ? "_exports['\(klass.name)']" : "_exports\(namespacePath).\(klass.name)" + namespacePath.isEmpty + ? "_exports['\(klass.resolvedJSName)']" : "_exports\(namespacePath).\(klass.resolvedJSName)" wrapperLines.append("importObject[\"\(moduleName)\"][\"\(wrapperFunctionName)\"] = function(pointer) {") wrapperLines.append(" const obj = \(exportsPath).__construct(pointer);") wrapperLines.append(" return \(JSGlueVariableScope.reservedSwift).memory.retain(obj);") @@ -1521,7 +1694,7 @@ public struct BridgeJSLink { // Add methods for method in type.methods { let methodName = method.resolvedJSName - let genericClause = renderGenericClause(method.genericParameterNames) + let genericClause = renderGenericClause(method.genericParameters ?? []) let methodSignature = "\(renderTSPropertyName(methodName))\(genericClause)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" printer.write(methodSignature) @@ -1558,6 +1731,9 @@ public struct BridgeJSLink { class ExportedThunkBuilder { var body: CodeFragmentPrinter var parameterForwardings: [String] = [] + + private var signatureParameters: [(parameter: Parameter, name: String)] = [] + let effects: Effects let scope: JSGlueVariableScope let context: IntrinsicJSFragment.PrintCodeContext @@ -1570,17 +1746,24 @@ public struct BridgeJSLink { scope: scope, printer: body, hasDirectAccessToSwiftClass: hasDirectAccessToSwiftClass, - classNamespaces: intrinsicRegistry.classNamespaces ) } + init(effects: Effects, context: IntrinsicJSFragment.PrintCodeContext) { + self.effects = effects + self.scope = context.scope.makeChildScope() + self.body = CodeFragmentPrinter() + self.context = context.with(\.scope, scope).with(\.printer, body) + } + func lowerParameter(param: Parameter) throws { let loweringFragment = try IntrinsicJSFragment.lowerParameter(type: param.type) assert( loweringFragment.parameters.count == 1, "Lowering fragment should have exactly one parameter to lower" ) - let paramName = scope.variable(param.name) + let paramName = scope.variable(param.escapedJSIdentifier) + signatureParameters.append((param, paramName)) let loweredValues = try loweringFragment.printCode([paramName], context) parameterForwardings.append(contentsOf: loweredValues) } @@ -1589,6 +1772,20 @@ public struct BridgeJSLink { parameterForwardings.append("this.pointer") } + var parameterList: String { + signatureParameters.map { parameter, name in + guard let defaultValue = parameter.defaultValue else { + return name + } + let defaultJs = DefaultValueUtils.format( + defaultValue, + as: .javascript, + resolveTypeName: context.defaultValueTypeName + ) + return "\(name) = \(defaultJs)" + }.joined(separator: ", ") + } + func call(abiName: String, returnType: BridgeType) throws -> String? { if effects.isAsync { return try _call(abiName: abiName, returnType: .jsObject(nil)) @@ -1613,6 +1810,7 @@ public struct BridgeJSLink { body.write("const \(returnVariable) = \(call);") fragmentArguments = [returnVariable] } + body.write(lines: checkExceptionLines()) let liftedValues = try liftingFragment.printCode(fragmentArguments, context) assert(liftedValues.count <= 1, "Lifting fragment should produce at most one value") return liftedValues.first @@ -1622,10 +1820,11 @@ public struct BridgeJSLink { let call = "\(JSGlueVariableScope.reservedInstance).exports.\(abiName)(\(parameterForwardings.joined(separator: ", ")))" body.write("const ret = \(call);") + body.write(lines: checkExceptionLines()) return "ret" } - func checkExceptionLines() -> [String] { + private func checkExceptionLines() -> [String] { guard effects.isThrows else { return [] } @@ -1641,10 +1840,9 @@ public struct BridgeJSLink { ] } - /// Renders the thunk body (body code, exception handling, and optional return) into a printer. + /// Renders the thunk body and optional return; `call`/`callConstructor` put the exception check in `body`. func renderFunctionBody(into printer: CodeFragmentPrinter, returnExpr: String?) { printer.write(contentsOf: body) - printer.write(lines: checkExceptionLines()) if let returnExpr = returnExpr { printer.write("return \(returnExpr);") } @@ -1652,14 +1850,11 @@ public struct BridgeJSLink { func renderFunction( name: String, - parameters: [Parameter], returnExpr: String?, declarationPrefixKeyword: String? ) -> [String] { let printer = CodeFragmentPrinter() - let parameterList = DefaultValueUtils.formatParameterList(parameters) - printer.write( "\(declarationPrefixKeyword.map { "\($0) "} ?? "")\(name)(\(parameterList)) {" ) @@ -1672,15 +1867,24 @@ public struct BridgeJSLink { } } - /// Returns TypeScript type string for a BridgeType, using full paths for enums - /// If the type is an enum, looks up the ExportedEnum and uses its tsFullPath - /// Otherwise, uses the default tsType property + private func inheritedProtocolTSNames(of proto: ExportedProtocol, in skeletons: [ExportedSkeleton]) -> [String]? { + guard let inherited = proto.inheritedJSProtocols, !inherited.isEmpty else { return nil } + return inherited.map { baseName in + for skeleton in skeletons { + if let base = skeleton.protocols.first(where: { $0.name == baseName }) { + return base.resolvedJSName + } + } + return baseName + } + } + + /// Resolves public TypeScript names without changing the skeleton's Swift type identities. private func resolveTypeScriptType(_ type: BridgeType) -> String { return Self.resolveTypeScriptType(type, exportedSkeletons: skeletons.compactMap(\.exported)) } - /// Static helper for resolving TypeScript types with full enum paths - /// Can be used by both BridgeJSLink and NamespaceBuilder + /// Recursively resolves nominal types in signatures shared by the linker and namespace builder. fileprivate static func resolveTypeScriptType(_ type: BridgeType, exportedSkeletons: [ExportedSkeleton]) -> String { switch type { case .caseEnum(let name), .rawValueEnum(let name, _), @@ -1716,11 +1920,18 @@ public struct BridgeJSLink { for skeleton in exportedSkeletons { for klass in skeleton.classes { if klass.swiftCallName == name { - return klass.name + return klass.resolvedJSName } } } return type.tsType + case .swiftProtocol(let name): + for skeleton in exportedSkeletons { + if let proto = skeleton.protocols.first(where: { $0.name == name }) { + return proto.resolvedJSName + } + } + return type.tsType case .closure(let signature, _): return signature.renderTSFunctionType { resolveTypeScriptType($0, exportedSkeletons: exportedSkeletons) } case .alias(_, let underlying): @@ -1751,15 +1962,26 @@ public struct BridgeJSLink { } else { returnTypeWithEffect = resolveTypeScriptType(returnType) } - let parameterSignatures = parameters.map { param in + return "\(renderTSParameterList(parameters)): \(returnTypeWithEffect)" + } + + private func renderTSParameterList(_ parameters: [Parameter]) -> String { + let parameterSignatures = zip(parameters, parameters.uniqueJSIdentifiers).map { param, name in let optional = param.hasDefault ? "?" : "" - return "\(param.name)\(optional): \(resolveTypeScriptType(param.type))" + return "\(name)\(optional): \(resolveTypeScriptType(param.type))" } - return "(\(parameterSignatures.joined(separator: ", "))): \(returnTypeWithEffect)" + return "(\(parameterSignatures.joined(separator: ", ")))" } - private func renderGenericClause(_ genericParameterNames: [String]) -> String { - genericParameterNames.isEmpty ? "" : "<\(genericParameterNames.joined(separator: ", "))>" + private func renderGenericClause(_ genericParameters: [GenericParameter]) -> String { + guard !genericParameters.isEmpty else { return "" } + let renderedParameters = genericParameters.map { genericParameter in + let constraints = genericParameter.constraints.map { resolveTypeScriptType(.swiftProtocol($0)) } + return constraints.isEmpty + ? genericParameter.name + : "\(genericParameter.name) extends \(constraints.joined(separator: " & "))" + } + return "<\(renderedParameters.joined(separator: ", "))>" } private func renderTSPropertyName(_ name: String) -> String { @@ -1783,7 +2005,7 @@ public struct BridgeJSLink { for line in renderJSDoc(documentation: structDefinition.documentation, parameters: []) { dtsTypePrinter.write(line) } - dtsTypePrinter.write("export interface \(structDefinition.name) {") + dtsTypePrinter.write("export interface \(structDefinition.resolvedJSName) {") dtsTypePrinter.indent { for property in structDefinition.properties where !property.isStatic { let tsType = resolveTypeScriptType(property.type) @@ -1858,8 +2080,7 @@ public struct BridgeJSLink { ) let constructorPrinter = CodeFragmentPrinter() - let paramList = DefaultValueUtils.formatParameterList(constructor.parameters) - constructorPrinter.write("init: function(\(paramList)) {") + constructorPrinter.write("init: function(\(thunkBuilder.parameterList)) {") constructorPrinter.indent { thunkBuilder.renderFunctionBody(into: constructorPrinter, returnExpr: returnExpr) } @@ -1917,7 +2138,7 @@ public struct BridgeJSLink { break } - if enumDefinition.namespace == nil { + if enumDefinition.resolvedJSNamespace == nil { dtsTypeLines.append(contentsOf: generateDeclarations(enumDefinition: enumDefinition)) } @@ -1926,7 +2147,7 @@ public struct BridgeJSLink { if enumDefinition.enumType != .namespace && enumDefinition.emitStyle != .tsEnum - && enumDefinition.namespace == nil + && enumDefinition.resolvedJSNamespace == nil { var enumMethodLines: [String] = [] for function in enumDefinition.staticMethods { @@ -1946,7 +2167,7 @@ public struct BridgeJSLink { let exportsPrinter = CodeFragmentPrinter() if !enumMethodLines.isEmpty || !enumPropertyLines.isEmpty { - exportsPrinter.write("\(enumDefinition.name): {") + exportsPrinter.write("\(enumDefinition.resolvedJSName): {") exportsPrinter.indent { exportsPrinter.write("...\(enumValuesName),") var allLines = enumMethodLines + enumPropertyLines @@ -1957,11 +2178,11 @@ public struct BridgeJSLink { } exportsPrinter.write("},") } else { - exportsPrinter.write("\(enumDefinition.name): \(enumValuesName),") + exportsPrinter.write("\(enumDefinition.resolvedJSName): \(enumValuesName),") } jsExportEntryLines = exportsPrinter.lines - dtsExportEntryLines = ["\(enumDefinition.name): \(enumDefinition.objectTypeName)"] + dtsExportEntryLines = ["\(enumDefinition.resolvedJSName): \(enumDefinition.objectTypeName)"] } return (jsTopLevelLines, jsExportEntryLines, dtsTypeLines, dtsExportEntryLines) @@ -1979,7 +2200,7 @@ public struct BridgeJSLink { case .tsEnum: switch enumDefinition.enumType { case .simple, .rawValue: - printer.write("export enum \(enumDefinition.name) {") + printer.write("export enum \(enumDefinition.resolvedJSName) {") printer.indent { for (index, enumCase) in enumDefinition.cases.enumerated() { let caseName = enumCase.name.capitalizedFirstLetter @@ -2013,7 +2234,7 @@ public struct BridgeJSLink { } printer.write("};") printer.write( - "export type \(enumDefinition.name)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" + "export type \(enumDefinition.resolvedJSName)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" ) printer.nextLine() case .associatedValue: @@ -2050,7 +2271,8 @@ public struct BridgeJSLink { } let unionTypeName = - enumDefinition.emitStyle == .tsEnum ? enumDefinition.name : "\(enumDefinition.name)Tag" + enumDefinition.emitStyle == .tsEnum + ? enumDefinition.resolvedJSName : "\(enumDefinition.resolvedJSName)Tag" printer.write("export type \(unionTypeName) =") printer.write(" " + unionParts.joined(separator: " | ")) printer.nextLine() @@ -2082,7 +2304,6 @@ extension BridgeJSLink { let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) let funcLines = thunkBuilder.renderFunction( name: function.abiName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "function" ) @@ -2133,7 +2354,6 @@ extension BridgeJSLink { let funcLines = thunkBuilder.renderFunction( name: function.resolvedJSName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "static" ) @@ -2163,7 +2383,7 @@ extension BridgeJSLink { let returnExpr = try thunkBuilder.call(abiName: function.abiName, returnType: function.returnType) let printer = CodeFragmentPrinter() - printer.write("\(function.resolvedJSName)(\(DefaultValueUtils.formatParameterList(function.parameters))) {") + printer.write("\(function.resolvedJSName)(\(thunkBuilder.parameterList)) {") printer.indent { thunkBuilder.renderFunctionBody(into: printer, returnExpr: returnExpr) } @@ -2195,7 +2415,6 @@ extension BridgeJSLink { let funcLines = thunkBuilder.renderFunction( name: function.abiName, - parameters: function.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "function" ) @@ -2220,7 +2439,7 @@ extension BridgeJSLink { let methodPrinter = CodeFragmentPrinter() methodPrinter.write( - "\(method.resolvedJSName): function(\(DefaultValueUtils.formatParameterList(method.parameters))) {" + "\(method.resolvedJSName): function(\(thunkBuilder.parameterList)) {" ) methodPrinter.indent { thunkBuilder.renderFunctionBody(into: methodPrinter, returnExpr: returnExpr) @@ -2270,7 +2489,7 @@ extension BridgeJSLink { returnType: .void ) - propertyPrinter.write("set \(property.resolvedJSName)(value) {") + propertyPrinter.write("set \(property.resolvedJSName)(\(setterThunkBuilder.parameterList)) {") propertyPrinter.indent { setterThunkBuilder.renderFunctionBody(into: propertyPrinter, returnExpr: nil) } @@ -2289,8 +2508,8 @@ extension BridgeJSLink { for line in renderJSDoc(documentation: klass.documentation, parameters: []) { dtsTypePrinter.write(line) } - dtsTypePrinter.write("export interface \(klass.name) extends SwiftHeapObject {") - jsPrinter.write("class \(klass.name) extends SwiftHeapObject {") + dtsTypePrinter.write("export interface \(klass.resolvedJSName) extends SwiftHeapObject {") + jsPrinter.write("class \(klass.resolvedJSName) extends SwiftHeapObject {") // Per-class identity mode: determine at codegen time whether this class uses identity caching let useIdentity = shouldUseIdentityCache(for: klass) @@ -2303,11 +2522,11 @@ extension BridgeJSLink { jsPrinter.indent { if useIdentity { jsPrinter.write( - "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.abiName)_deinit, \(klass.name).prototype, \(klass.name).__identityCache);" + "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.abiName)_deinit, \(klass.resolvedJSName).prototype, \(klass.resolvedJSName).__identityCache);" ) } else { jsPrinter.write( - "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.abiName)_deinit, \(klass.name).prototype, null);" + "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.abiName)_deinit, \(klass.resolvedJSName).prototype, null);" ) } } @@ -2324,12 +2543,10 @@ extension BridgeJSLink { try thunkBuilder.lowerParameter(param: param) } - let constructorParamList = DefaultValueUtils.formatParameterList(constructor.parameters) - jsPrinter.indent { - jsPrinter.write("constructor(\(constructorParamList)) {") + jsPrinter.write("constructor(\(thunkBuilder.parameterList)) {") let returnExpr = thunkBuilder.callConstructor(abiName: constructor.abiName) - let constructCall = "\(klass.name).__construct(\(returnExpr))" + let constructCall = "\(klass.resolvedJSName).__construct(\(returnExpr))" jsPrinter.indent { thunkBuilder.renderFunctionBody( into: jsPrinter, @@ -2355,7 +2572,6 @@ extension BridgeJSLink { jsPrinter.write( lines: thunkBuilder.renderFunction( name: method.resolvedJSName, - parameters: method.parameters, returnExpr: returnExpr, declarationPrefixKeyword: "static" ) @@ -2376,7 +2592,6 @@ extension BridgeJSLink { jsPrinter.write( lines: thunkBuilder.renderFunction( name: method.resolvedJSName, - parameters: method.parameters, returnExpr: returnExpr, declarationPrefixKeyword: nil ) @@ -2423,7 +2638,7 @@ extension BridgeJSLink { lines: renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters) ) printer.write( - "new\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name), effects: constructor.effects));" + "new\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.swiftCallName), effects: constructor.effects));" ) } for method in klass.methods where method.effects.isStatic { @@ -2445,17 +2660,13 @@ extension BridgeJSLink { ) -> [String] { let printer = CodeFragmentPrinter() printer.write(lines: renderJSDoc(documentation: klass.documentation, parameters: [])) - printer.write("class \(klass.name) {") + printer.write("class \(klass.resolvedJSName) {") printer.indent { if let constructor = klass.constructor { - let paramSignatures = constructor.parameters.map { param in - let optional = param.hasDefault ? "?" : "" - return "\(param.name)\(optional): \(param.type.tsType)" - } printer.write( lines: renderJSDoc(documentation: constructor.documentation, parameters: constructor.parameters) ) - printer.write("constructor(\(paramSignatures.joined(separator: ", ")));") + printer.write("constructor\(renderTSParameterList(constructor.parameters));") } for method in klass.methods.sorted(by: { $0.resolvedJSName < $1.resolvedJSName }) { let staticKeyword = method.effects.isStatic ? "static " : "" @@ -2501,7 +2712,6 @@ extension BridgeJSLink { jsPrinter.write( lines: getterThunkBuilder.renderFunction( name: property.resolvedJSName, - parameters: [], returnExpr: getterReturnExpr, declarationPrefixKeyword: getterKeyword ) @@ -2529,7 +2739,6 @@ extension BridgeJSLink { jsPrinter.write( lines: setterThunkBuilder.renderFunction( name: property.resolvedJSName, - parameters: [.init(label: nil, name: "value", type: property.type)], returnExpr: nil, declarationPrefixKeyword: setterKeyword ) @@ -2577,7 +2786,6 @@ extension BridgeJSLink { scope: scope, printer: body, hasDirectAccessToSwiftClass: false, - classNamespaces: intrinsicRegistry.classNamespaces ) } @@ -2605,7 +2813,7 @@ extension BridgeJSLink { message: "Generic codec for '\(name)' was not declared before lifting parameter '\(param.name)'" ) } - let valueVar = scope.variable(param.name) + let valueVar = scope.variable(param.escapedJSIdentifier) let liftExpr = GenericJSCodegen.genericCodecLiftExpression(type: param.type, codec: codecVar) ?? "\(codecVar).lift()" @@ -2618,8 +2826,9 @@ extension BridgeJSLink { if liftingFragment.parameters.count == 0 { valuesToLift = [] } else if liftingFragment.parameters.count == 1 { - parameterNames.append(param.name) - valuesToLift = [scope.variable(param.name)] + let name = scope.variable(param.escapedJSIdentifier) + parameterNames.append(name) + valuesToLift = [name] } else { valuesToLift = liftingFragment.parameters.map { scope.variable(param.name + $0.capitalizedFirstLetter) } parameterNames.append(contentsOf: valuesToLift) @@ -2679,9 +2888,8 @@ extension BridgeJSLink { /// Renders an async import function with resolve/reject closure refs. /// - /// The generated function takes `resolveRef` and `rejectRef` as the first parameters, - /// looks up the resolve/reject closures from memory, and executes the body which - /// chains `.then(resolve, reject)` on the import's returned Promise. + /// The generated function takes `resolveRef` and `rejectRef` as the first parameters + /// and settles them with the result of the import call. private func renderAsyncFunction(name: String?) -> [String] { let printer = CodeFragmentPrinter() let allParams = ["resolveRef", "rejectRef"] + parameterNames @@ -2690,7 +2898,15 @@ extension BridgeJSLink { let s = JSGlueVariableScope.reservedSwift printer.write("const resolve = \(s).memory.getObject(resolveRef);") printer.write("const reject = \(s).memory.getObject(rejectRef);") - printer.write(contentsOf: body) + printer.write("try {") + printer.indent { + printer.write(contentsOf: body) + } + printer.write("} catch (error) {") + printer.indent { + printer.write("reject(error);") + } + printer.write("}") } printer.write("}") return printer.lines @@ -2712,7 +2928,7 @@ extension BridgeJSLink { private func call(callExpr: String) throws { if effects.isAsync { - body.write("\(callExpr).then(resolve, reject);") + body.write("Promise.resolve(\(callExpr)).then(resolve, reject);") return } if let name = returnType.referencedGenericName { @@ -2779,14 +2995,6 @@ extension BridgeJSLink { return try call(calleeExpr: calleeExpr) } - /// Generates an async method call with resolve/reject closure refs. - func callAsyncMethod(name: String) { - let objectExpr = "\(JSGlueVariableScope.reservedSwift).memory.getObject(self)" - let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) - let callExpr = "\(calleeExpr)(\(parameterForwardings.joined(separator: ", ")))" - body.write("\(callExpr).then(resolve, reject);") - } - func callStaticMethod(on objectExpr: String, name: String) throws { let calleeExpr = Self.propertyAccessExpr(objectExpr: objectExpr, propertyName: name) return try call(calleeExpr: calleeExpr) @@ -2915,9 +3123,9 @@ extension BridgeJSLink { return Set( exportedSkeletons.flatMap { skeleton in let itemNamespaces = - (skeleton.functions.compactMap(\.namespace) + skeleton.classes.compactMap(\.namespace) - + skeleton.enums.filter { $0.namespace != nil && $0.enumType != .namespace } - .compactMap(\.namespace)) + (skeleton.functions.compactMap(\.namespace) + skeleton.classes.compactMap(\.resolvedJSNamespace) + + skeleton.enums.filter { $0.resolvedJSNamespace != nil && $0.enumType != .namespace } + .compactMap(\.resolvedJSNamespace)) let namespaceEnumPaths = skeleton.enums .filter { $0.enumType == .namespace } @@ -2944,8 +3152,9 @@ extension BridgeJSLink { var namespacedEnumPaths: Set<[String]> = [] for skeleton in globalSkeletons { - for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { - namespacedEnumPaths.insert(enumDef.namespace!) + for enumDef in skeleton.enums where enumDef.resolvedJSNamespace != nil && enumDef.enumType != .namespace + { + namespacedEnumPaths.insert(enumDef.resolvedJSNamespace!) } } @@ -2955,8 +3164,9 @@ extension BridgeJSLink { printer.write(lines: initCode) for skeleton in globalSkeletons { - for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { - let namespacePath = enumDef.namespace!.joined(separator: ".") + for enumDef in skeleton.enums where enumDef.resolvedJSNamespace != nil && enumDef.enumType != .namespace + { + let namespacePath = enumDef.resolvedJSNamespace!.joined(separator: ".") printer.write("globalThis.\(namespacePath).\(enumDef.valuesName) = \(enumDef.valuesName);") } } @@ -2968,9 +3178,11 @@ extension BridgeJSLink { let printer = CodeFragmentPrinter() for skeleton in exportedSkeletons where skeleton.exposeToGlobal { - for klass in skeleton.classes where klass.namespace != nil { - let namespacePath = klass.namespace!.joined(separator: ".") - printer.write("globalThis.\(namespacePath).\(klass.name) = exports.\(namespacePath).\(klass.name);") + for klass in skeleton.classes where klass.resolvedJSNamespace != nil { + let namespacePath = klass.resolvedJSNamespace!.joined(separator: ".") + printer.write( + "globalThis.\(namespacePath).\(klass.resolvedJSName) = exports.\(namespacePath).\(klass.resolvedJSName);" + ) } for function in skeleton.functions where function.namespace != nil { let namespacePath = function.namespace!.joined(separator: ".") @@ -3113,9 +3325,10 @@ extension BridgeJSLink { currentNode.content.declaration = .structType(structDef) } - for enumDef in skeleton.enums where enumDef.namespace != nil && enumDef.enumType != .namespace { + for enumDef in skeleton.enums where enumDef.resolvedJSNamespace != nil && enumDef.enumType != .namespace + { var currentNode = rootNode - for part in enumDef.namespace! { + for part in enumDef.resolvedJSNamespace! { currentNode = currentNode.addChild(part) } currentNode.content.enums.append(enumDef) @@ -3192,7 +3405,9 @@ extension BridgeJSLink { } for enumDef in node.content.enums { - node.content.enumDtsLines.append((enumDef.name, "\(enumDef.name): \(enumDef.objectTypeName)")) + node.content.enumDtsLines.append( + (enumDef.resolvedJSName, "\(enumDef.resolvedJSName): \(enumDef.objectTypeName)") + ) } for (_, childNode) in node.children { @@ -3277,7 +3492,6 @@ extension BridgeJSLink { getterPrinter.write("get \(property.resolvedJSName)() {") getterPrinter.indent { getterPrinter.write(contentsOf: getterThunkBuilder.body) - getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines()) if let returnExpr = getterReturnExpr { getterPrinter.write("return \(returnExpr);") } @@ -3301,10 +3515,9 @@ extension BridgeJSLink { ) let setterPrinter = CodeFragmentPrinter() - setterPrinter.write("set \(property.resolvedJSName)(value) {") + setterPrinter.write("set \(property.resolvedJSName)(\(setterThunkBuilder.parameterList)) {") setterPrinter.indent { setterPrinter.write(contentsOf: setterThunkBuilder.body) - setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines()) } setterPrinter.write("},") @@ -3403,7 +3616,7 @@ extension BridgeJSLink { printer.write(lines: node.content.structJsLines) for enumDef in node.content.enums.sorted(by: { $0.name < $1.name }) { - printer.write("\(enumDef.name): \(enumDef.valuesName),") + printer.write("\(enumDef.resolvedJSName): \(enumDef.valuesName),") } // Print function and property implementations @@ -3566,7 +3779,7 @@ extension BridgeJSLink { case .simple: switch style { case .tsEnum: - printer.write("enum \(enumDefinition.name) {") + printer.write("enum \(enumDefinition.resolvedJSName) {") printer.indent { for (index, enumCase) in enumDefinition.cases.enumerated() { let caseName = enumCase.name.capitalizedFirstLetter @@ -3584,14 +3797,14 @@ extension BridgeJSLink { } printer.write("};") printer.write( - "type \(enumDefinition.name)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" + "type \(enumDefinition.resolvedJSName)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" ) } case .rawValue: guard let rawType = enumDefinition.rawType else { continue } switch style { case .tsEnum: - printer.write("enum \(enumDefinition.name) {") + printer.write("enum \(enumDefinition.resolvedJSName) {") printer.indent { for (index, enumCase) in enumDefinition.cases.enumerated() { let caseName = enumCase.name.capitalizedFirstLetter @@ -3617,7 +3830,7 @@ extension BridgeJSLink { } printer.write("};") printer.write( - "type \(enumDefinition.name)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" + "type \(enumDefinition.resolvedJSName)Tag = typeof \(enumValuesName)[keyof typeof \(enumValuesName)];" ) } case .associatedValue: @@ -3656,7 +3869,8 @@ extension BridgeJSLink { } } let unionTypeName = - enumDefinition.emitStyle == .tsEnum ? enumDefinition.name : "\(enumDefinition.name)Tag" + enumDefinition.emitStyle == .tsEnum + ? enumDefinition.resolvedJSName : "\(enumDefinition.resolvedJSName)Tag" printer.write("type \(unionTypeName) =") printer.write(" " + unionParts.joined(separator: " | ")) case .namespace: @@ -3681,7 +3895,9 @@ extension BridgeJSLink { for property in sortedProperties { let readonly = property.isReadonly ? "var " : "let " printer.write(lines: renderDocCallback(property.documentation, [])) - printer.write("\(readonly)\(property.resolvedJSName): \(property.type.tsType);") + printer.write( + "\(readonly)\(property.resolvedJSName): \(BridgeJSLink.resolveTypeScriptType(property.type, exportedSkeletons: exportedSkeletons));" + ) } } @@ -3730,7 +3946,7 @@ extension BridgeJSLink { try thunkBuilder.call(calleeExpr: calleeExpr) let funcLines = thunkBuilder.renderFunction(name: function.abiName(context: nil)) if function.from == nil { - let genericClause = renderGenericClause(genericParameters) + let genericClause = renderGenericClause(function.genericParameters ?? []) importObjectBuilder.appendDts( [ "\(renderTSPropertyName(jsName))\(genericClause)\(renderTSSignature(parameters: function.parameters, returnType: function.returnType, effects: function.effects));" @@ -3762,7 +3978,8 @@ extension BridgeJSLink { let abiName = getter.abiName(context: nil) let funcLines = thunkBuilder.renderFunction(name: abiName) if getter.from == nil { - importObjectBuilder.appendDts(["readonly \(renderTSPropertyName(jsName)): \(getter.type.tsType);"] + importObjectBuilder.appendDts( + ["readonly \(renderTSPropertyName(jsName)): \(resolveTypeScriptType(getter.type));"] ) } importObjectBuilder.assignToImportObject(name: abiName, function: funcLines) @@ -3823,14 +4040,14 @@ extension BridgeJSLink { dtsPrinter.indent { if let constructor = type.constructor { let returnType = BridgeType.jsObject(type.name) - let genericClause = renderGenericClause(constructor.genericParameterNames) + let genericClause = renderGenericClause(constructor.genericParameters ?? []) dtsPrinter.write( "new\(genericClause)\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));" ) } for method in type.staticMethods { let methodName = method.resolvedJSName - let genericClause = renderGenericClause(method.genericParameterNames) + let genericClause = renderGenericClause(method.genericParameters ?? []) let signature = "\(renderTSPropertyName(methodName))\(genericClause)\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));" dtsPrinter.write(signature) @@ -4006,7 +4223,7 @@ extension BridgeJSLink { method: ExportedFunction ) throws { let thunkBuilder = ImportedThunkBuilder( - effects: Effects(isAsync: false, isThrows: false), + effects: method.effects, returnType: method.returnType, context: .exportSwift, intrinsicRegistry: intrinsicRegistry @@ -4029,7 +4246,11 @@ enum DefaultValueUtils { } /// Generates default value representation for JavaScript or TypeScript - static func format(_ defaultValue: DefaultValue, as format: OutputFormat) -> String { + static func format( + _ defaultValue: DefaultValue, + as format: OutputFormat, + resolveTypeName: (BridgeType, OutputFormat) -> String? = { _, _ in nil } + ) -> String { switch defaultValue { case .string(let value): let escapedValue = @@ -4049,23 +4270,26 @@ enum DefaultValueUtils { return "null" case .enumCase(let enumName, let caseName): let simpleName = enumName.components(separatedBy: ".").last ?? enumName - let jsEnumName = format == .javascript ? "\(simpleName)\(ExportedEnum.valuesSuffix)" : simpleName + let jsEnumName = + resolveTypeName(.caseEnum(enumName), format) + ?? (format == .javascript ? "\(simpleName)\(ExportedEnum.valuesSuffix)" : simpleName) return "\(jsEnumName).\(caseName.capitalizedFirstLetter)" case .object(let className): - return "new \(className)()" + return "new \(resolveTypeName(.swiftHeapObject(className), format) ?? className)()" case .objectWithArguments(let className, let args): let argStrings = args.map { arg in - Self.format(arg, as: format) + Self.format(arg, as: format, resolveTypeName: resolveTypeName) } - return "new \(className)(\(argStrings.joined(separator: ", ")))" + let name = resolveTypeName(.swiftHeapObject(className), format) ?? className + return "new \(name)(\(argStrings.joined(separator: ", ")))" case .structLiteral(_, let fields): let fieldStrings = fields.map { field in - "\(field.name): \(Self.format(field.value, as: format))" + "\(field.name): \(Self.format(field.value, as: format, resolveTypeName: resolveTypeName))" } return "{ \(fieldStrings.joined(separator: ", ")) }" case .array(let elements): let elementStrings = elements.map { element in - DefaultValueUtils.format(element, as: format) + DefaultValueUtils.format(element, as: format, resolveTypeName: resolveTypeName) } return "[\(elementStrings.joined(separator: ", "))]" } @@ -4077,17 +4301,6 @@ enum DefaultValueUtils { .replacingOccurrences(of: "\\", with: "\\\\") .replacingOccurrences(of: "\"", with: "\\\"") } - - /// Generates a JavaScript parameter list with default values - static func formatParameterList(_ parameters: [Parameter]) -> String { - return parameters.map { param in - if let defaultValue = param.defaultValue { - let defaultJs = format(defaultValue, as: .javascript) - return "\(param.name) = \(defaultJs)" - } - return param.name - }.joined(separator: ", ") - } } extension BridgeJSLink { @@ -4097,17 +4310,24 @@ extension BridgeJSLink { fileprivate func renderJSDoc(documentation: String?, parameters: [Parameter]) -> [String] { let parsed = documentation.map(DocCComment.init(parsing:)) ?? DocCComment() + let resolveTypeName = makeCodecPrintContext(printer: CodeFragmentPrinter()).defaultValueTypeName var tagLines: [String] = [] - for parameter in parameters { + for (parameter, name) in zip(parameters, parameters.uniqueJSIdentifiers) { let docText = parsed.parameter(named: parameter.name) - let defaultValue = parameter.defaultValue.map { DefaultValueUtils.format($0, as: .typescript) } + let defaultValue = parameter.defaultValue.map { + DefaultValueUtils.format( + $0, + as: .typescript, + resolveTypeName: resolveTypeName + ) + } switch (docText, defaultValue) { case let (.some(text), .some(value)): - tagLines.append("@param \(parameter.name) \(text) (default: \(value))") + tagLines.append("@param \(name) \(text) (default: \(value))") case let (.some(text), .none): - tagLines.append("@param \(parameter.name) \(text)") + tagLines.append("@param \(name) \(text)") case let (.none, .some(value)): - tagLines.append("@param \(parameter.name) - Optional parameter (default: \(value))") + tagLines.append("@param \(name) - Optional parameter (default: \(value))") case (.none, .none): continue } @@ -4232,6 +4452,38 @@ struct BridgeJSLinkError: Error { let message: String } +extension Parameter { + // From: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words + private static let javaScriptReservedWords: Set = [ + "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", + "export", "extends", "false", "finally", "for", "function", "if", "import", "in", "instanceof", "new", + "null", "return", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", + "with", "let", "static", "yield", "await", "enum", "implements", "interface", "package", "private", + "protected", "public", "arguments", "eval", + ] + + fileprivate var escapedJSIdentifier: String { + Self.javaScriptReservedWords.contains(name) ? "_\(name)" : name + } +} + +extension [Parameter] { + fileprivate var uniqueJSIdentifiers: [String] { + var names: [String] = [] + for parameter in self { + let escapedName = parameter.escapedJSIdentifier + var name = escapedName + var suffix = 1 + while names.contains(name) { + name = escapedName + suffix.description + suffix += 1 + } + names.append(name) + } + return names + } +} + extension ClosureSignature { fileprivate func renderTSFunctionType(renderType: (BridgeType) -> String) -> String { let renderedParameters = parameters.enumerated().map { index, parameter in diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift index 3f8530c55..20f231dc8 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift @@ -14,6 +14,8 @@ final class JSGlueVariableScope { static let reservedMemory = "memory" static let reservedSetException = "setException" static let reservedDecodeString = "decodeString" + static let reservedDecodeUTF8 = "decodeUTF8" + static let reservedImmortalStrings = "immortalStrings" static let reservedStorageToReturnString = "tmpRetString" static let reservedStorageToReturnBytes = "tmpRetBytes" static let reservedStorageToReturnException = "tmpRetException" @@ -49,6 +51,8 @@ final class JSGlueVariableScope { reservedMemory, reservedSetException, reservedDecodeString, + reservedDecodeUTF8, + reservedImmortalStrings, reservedStorageToReturnString, reservedStorageToReturnBytes, reservedStorageToReturnException, @@ -110,6 +114,14 @@ final class JSGlueVariableScope { intrinsicRegistry.typeOwnerModules[typeName] } + func exportedClassPath(forSwiftName name: String) -> [String]? { + intrinsicRegistry.classPaths[name] + } + + func renamedEnumNames(forSwiftName name: String) -> (value: String, type: String)? { + intrinsicRegistry.renamedEnumNames[name] + } + func makeChildScope() -> JSGlueVariableScope { JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry) } @@ -532,8 +544,6 @@ struct IntrinsicJSFragment: Sendable { /// Whether the fragment has direct access to the SwiftHeapObject classes. /// If false, the fragment needs to use `_exports` to access the class. var hasDirectAccessToSwiftClass: Bool = true - /// Maps class names to their namespace path components for resolving `_exports` access. - var classNamespaces: [String: [String]] = [:] func with(_ keyPath: WritableKeyPath, _ value: T) -> PrintCodeContext { var new = self @@ -545,20 +555,30 @@ struct IntrinsicJSFragment: Sendable { qualifiedName.split(separator: ".").last.map(String.init) ?? qualifiedName } - private func exportsAccess(forClass name: String) -> String { - if let namespace = classNamespaces[name], !namespace.isEmpty { - let path = namespace.map { ".\($0)" }.joined() - return "_exports\(path).\(name)" - } - return "_exports['\(name)']" - } - func classReference(forQualifiedName qualifiedName: String) -> String { + if let path = scope.exportedClassPath(forSwiftName: qualifiedName), let name = path.last { + if hasDirectAccessToSwiftClass { + return name + } + return path.count == 1 ? "_exports['\(name)']" : "_exports.\(path.joined(separator: "."))" + } if hasDirectAccessToSwiftClass { return unqualifiedClassName(for: qualifiedName) } - let unqualified = unqualifiedClassName(for: qualifiedName) - return exportsAccess(forClass: unqualified) + return "_exports['\(unqualifiedClassName(for: qualifiedName))']" + } + + func defaultValueTypeName(_ type: BridgeType, _ format: DefaultValueUtils.OutputFormat) -> String? { + switch type { + case .swiftHeapObject(let name): + guard let jsName = scope.exportedClassPath(forSwiftName: name)?.last else { return nil } + return format == .javascript ? classReference(forQualifiedName: name) : jsName + case .caseEnum(let name): + guard let renamed = scope.renamedEnumNames(forSwiftName: name) else { return nil } + return format == .javascript ? renamed.value : renamed.type + default: + return nil + } } } @@ -662,14 +682,15 @@ struct IntrinsicJSFragment: Sendable { } ) static let stringLiftParameter = IntrinsicJSFragment( - parameters: ["bytes", "count"], + parameters: ["word0", "word1", "word2"], printCode: { arguments, context in let (scope, printer) = (context.scope, context.printer) - let bytesExpr = arguments[0] - let countExpr = arguments[1] + let word0Expr = arguments[0] + let word1Expr = arguments[1] + let word2Expr = arguments[2] let stringLabel = scope.variable("string") printer.write( - "const \(stringLabel) = \(JSGlueVariableScope.reservedDecodeString)(\(bytesExpr), \(countExpr));" + "const \(stringLabel) = \(JSGlueVariableScope.reservedDecodeString)(\(word0Expr), \(word1Expr), \(word2Expr));" ) return [stringLabel] } @@ -728,6 +749,27 @@ struct IntrinsicJSFragment: Sendable { private static let jsValueLowerHelperName = "__bjs_jsValueLower" private static let jsValueLiftHelperName = "__bjs_jsValueLift" + private static let jsValueTakeHelperName = "__bjs_jsValueTake" + + /// Mirrors `JavaScriptValueKind` in `_CJavaScriptKit.h`. + private enum JSValueKind: Int, CaseIterable { + case boolean = 0 + case string = 1 + case number = 2 + case object = 3 + case null = 4 + case undefined = 5 + case symbol = 7 + case bigInt = 8 + + /// Whether `payload1` is a reference in `swift.memory`. + var holdsReference: Bool { + switch self { + case .string, .object, .symbol, .bigInt: return true + case .boolean, .number, .null, .undefined: return false + } + } + } private static func registerJSValueHelpers(scope: JSGlueVariableScope) { scope.registerIntrinsic("jsValueHelpers") { helperPrinter in @@ -756,6 +798,20 @@ struct IntrinsicJSFragment: Sendable { helperPrinter.write("return \(resultVar);") } helperPrinter.write("}") + helperPrinter.write("function \(jsValueTakeHelperName)(kind, payload1, payload2) {") + helperPrinter.indent { + helperPrinter.write("const value = \(jsValueLiftHelperName)(kind, payload1, payload2);") + let holdsReference = JSValueKind.allCases.filter(\.holdsReference) + .map { "kind === \($0.rawValue)" } + .joined(separator: " || ") + helperPrinter.write("if (\(holdsReference)) {") + helperPrinter.indent { + helperPrinter.write("\(JSGlueVariableScope.reservedSwift).memory.release(payload1);") + } + helperPrinter.write("}") + helperPrinter.write("return value;") + } + helperPrinter.write("}") } } @@ -771,7 +827,7 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(payload2Var);") printer.write("if (\(value) === null) {") printer.indent { - printer.write("\(kindVar) = 4;") + printer.write("\(kindVar) = \(JSValueKind.null.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = 0;") } @@ -781,22 +837,22 @@ struct IntrinsicJSFragment: Sendable { printer.indent { printer.write("case \"boolean\":") printer.indent { - printer.write("\(kindVar) = 0;") + printer.write("\(kindVar) = \(JSValueKind.boolean.rawValue);") printer.write("\(payload1Var) = \(value) ? 1 : 0;") printer.write("\(payload2Var) = 0;") printer.write("break;") } printer.write("case \"number\":") printer.indent { - printer.write("\(kindVar) = 2;") + printer.write("\(kindVar) = \(JSValueKind.number.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = \(value);") printer.write("break;") } - func emitRetainCase(_ caseName: String, kind: Int) { + func emitRetainCase(_ caseName: String, kind: JSValueKind) { printer.write("case \"\(caseName)\":") printer.indent { - printer.write("\(kindVar) = \(kind);") + printer.write("\(kindVar) = \(kind.rawValue);") printer.write( "\(payload1Var) = \(JSGlueVariableScope.reservedSwift).memory.retain(\(value));" ) @@ -804,18 +860,18 @@ struct IntrinsicJSFragment: Sendable { printer.write("break;") } } - emitRetainCase("string", kind: 1) + emitRetainCase("string", kind: .string) printer.write("case \"undefined\":") printer.indent { - printer.write("\(kindVar) = 5;") + printer.write("\(kindVar) = \(JSValueKind.undefined.rawValue);") printer.write("\(payload1Var) = 0;") printer.write("\(payload2Var) = 0;") printer.write("break;") } - emitRetainCase("object", kind: 3) - emitRetainCase("function", kind: 3) - emitRetainCase("symbol", kind: 7) - emitRetainCase("bigint", kind: 8) + emitRetainCase("object", kind: .object) + emitRetainCase("function", kind: .object) + emitRetainCase("symbol", kind: .symbol) + emitRetainCase("bigint", kind: .bigInt) printer.write("default:") printer.indent { printer.write("throw new TypeError(\"Unsupported JSValue type\");") @@ -853,53 +909,21 @@ struct IntrinsicJSFragment: Sendable { printer.write("let \(resultVar);") printer.write("switch (\(kind)) {") printer.indent { - printer.write("case 0:") - printer.indent { - printer.write("\(resultVar) = \(payload1) !== 0;") - printer.write("break;") - } - printer.write("case 1:") - printer.indent { - printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" - ) - printer.write("break;") - } - printer.write("case 2:") - printer.indent { - printer.write("\(resultVar) = \(payload2);") - printer.write("break;") - } - printer.write("case 3:") - printer.indent { - printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" - ) - printer.write("break;") - } - printer.write("case 4:") - printer.indent { - printer.write("\(resultVar) = null;") - printer.write("break;") - } - printer.write("case 5:") - printer.indent { - printer.write("\(resultVar) = undefined;") - printer.write("break;") - } - printer.write("case 7:") - printer.indent { - printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" - ) - printer.write("break;") - } - printer.write("case 8:") - printer.indent { - printer.write( - "\(resultVar) = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1));" - ) - printer.write("break;") + for valueKind in JSValueKind.allCases { + let value: String + switch valueKind { + case .boolean: value = "\(payload1) !== 0" + case .number: value = payload2 + case .null: value = "null" + case .undefined: value = "undefined" + case .string, .object, .symbol, .bigInt: + value = "\(JSGlueVariableScope.reservedSwift).memory.getObject(\(payload1))" + } + printer.write("case \(valueKind.rawValue):") + printer.indent { + printer.write("\(resultVar) = \(value);") + printer.write("break;") + } } printer.write("default:") printer.indent { @@ -940,11 +964,12 @@ struct IntrinsicJSFragment: Sendable { let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( - "const \(resultVar) = \(jsValueLiftHelperName)(\(kind), \(payload1), \(payload2));" + "const \(resultVar) = \(jsValueTakeHelperName)(\(kind), \(payload1), \(payload2));" ) return [resultVar] } ) + /// Swift lends the payload reference for the duration of the call, so it is not released here. static let jsValueLiftParameter = IntrinsicJSFragment( parameters: ["kind", "payload1", "payload2"], printCode: { arguments, context in @@ -2211,7 +2236,7 @@ struct IntrinsicJSFragment: Sendable { let resultVar = scope.variable("jsValue") registerJSValueHelpers(scope: scope) printer.write( - "const \(resultVar) = \(jsValueLiftHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" + "const \(resultVar) = \(jsValueTakeHelperName)(\(kindVar), \(payload1Var), \(payload2Var));" ) return [resultVar] } @@ -2565,34 +2590,22 @@ struct IntrinsicJSFragment: Sendable { // Attach instance methods to the struct instance for method in structDef.methods where !method.effects.isStatic { - let paramList = DefaultValueUtils.formatParameterList(method.parameters) + let builder = BridgeJSLink.ExportedThunkBuilder( + effects: method.effects, + context: context + ) + builder.body.write( + "\(JSGlueVariableScope.reservedStructHelpers).\(context.scope.helperKey(forTypeNamed: structDef.swiftCallName)).lower(this);" + ) + for param in method.parameters { + try builder.lowerParameter(param: param) + } + let returnExpr = try builder.call(abiName: method.abiName, returnType: method.returnType) printer.write( - "\(instanceVar).\(method.resolvedJSName) = function(\(paramList)) {" + "\(instanceVar).\(method.resolvedJSName) = function(\(builder.parameterList)) {" ) - try printer.indent { - printer.write( - "\(JSGlueVariableScope.reservedStructHelpers).\(context.scope.helperKey(forTypeNamed: structDef.swiftCallName)).lower(this);" - ) - - var paramForwardings: [String] = [] - for param in method.parameters { - let fragment = try IntrinsicJSFragment.lowerParameter(type: param.type) - let loweredValues = try fragment.printCode([param.name], context) - paramForwardings.append(contentsOf: loweredValues) - } - - let callExpr = "instance.exports.\(method.abiName)(\(paramForwardings.joined(separator: ", ")))" - if method.returnType == .void { - printer.write("\(callExpr);") - } else { - let liftFragment = try IntrinsicJSFragment.liftReturn(type: method.returnType) - let returnVariable = context.scope.variable("ret") - printer.write("const \(returnVariable) = \(callExpr);") - let lifted = try liftFragment.printCode([returnVariable], context) - if let liftedValue = lifted.first { - printer.write("return \(liftedValue);") - } - } + printer.indent { + builder.renderFunctionBody(into: printer, returnExpr: returnExpr) } printer.write("}.bind(\(instanceVar));") } diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift index d0bf2781f..8dfca16b6 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSLink/JSIntrinsicRegistry.swift @@ -5,7 +5,8 @@ import BridgeJSUtilities /// Registry for JS helper intrinsics used during code generation. final class JSIntrinsicRegistry { private var entries: [String: [String]] = [:] - var classNamespaces: [String: [String]] = [:] + var classPaths: [String: [String]] = [:] + var renamedEnumNames: [String: (value: String, type: String)] = [:] var typeOwnerModules: [String: String] = [:] @@ -42,7 +43,8 @@ final class JSIntrinsicRegistry { func reset() { entries.removeAll() - classNamespaces.removeAll() + classPaths.removeAll() + renamedEnumNames.removeAll() typeOwnerModules.removeAll() codecNameOrder.removeAll() codecBodies.removeAll() diff --git a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift index 224462ddb..c347bfb21 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSMacros/JSMacroSupport.swift @@ -90,8 +90,9 @@ enum JSMacroHelper { static func parameterNames(_ parameters: FunctionParameterListSyntax) -> [String] { parameters.compactMap { param in let nameToken = param.secondName ?? param.firstName - let nameText = nameToken.text - return nameText == "_" ? nil : nameText + guard nameToken.text != "_" else { return nil } + let nameText = stripBackticks(nameToken.text) + return nameText.isValidSwiftIdentifier(for: .variableName) ? nameText : "`\(nameText)`" } } diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift index 8aaa6d5cd..d52e9122d 100644 --- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift +++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift @@ -4,10 +4,17 @@ public protocol NamespacedExportedType { var name: String { get } + var jsName: String? { get } + /// The namespace using Swift declaration names, retained for ABI generation. var namespace: [String]? { get } + /// The public namespace when an enclosing declaration has an exported name override. + var jsNamespace: [String]? { get } } extension NamespacedExportedType { + public var resolvedJSName: String { jsName ?? name } + public var resolvedJSNamespace: [String]? { jsNamespace ?? namespace } + public var abiName: String { if let namespace = namespace, !namespace.isEmpty { return (namespace + [name]).joined(separator: "_") @@ -16,7 +23,7 @@ extension NamespacedExportedType { } public var tsPathComponents: [String] { - (namespace ?? []) + [name] + (resolvedJSNamespace ?? []) + [resolvedJSName] } public var tsFullPath: String { @@ -375,6 +382,14 @@ extension ExportedSkeleton { guard let bridgeType = enumDef.genericBridgeType else { continue } entries.append(GenericBridgeableTypeEntry(swiftName: enumDef.swiftCallName, bridgeType: bridgeType)) } + for proto in protocols where proto.isGenericBridgeable == true { + entries.append( + GenericBridgeableTypeEntry( + swiftName: "Any\(proto.name)", + bridgeType: .swiftProtocol(proto.name) + ) + ) + } return entries } } @@ -539,6 +554,44 @@ public struct Parameter: Codable, Equatable, Sendable { } } +public struct GenericParameter: Codable, Equatable, Hashable, Sendable { + public let name: String + public let constraints: [String] + public let swiftConstraints: [String]? + + public init(name: String, constraints: [String] = [], swiftConstraints: [String]? = nil) { + self.name = name + self.constraints = constraints + self.swiftConstraints = swiftConstraints == constraints ? nil : swiftConstraints + } + + private enum CodingKeys: String, CodingKey { + case name, constraints, swiftConstraints + } + + public init(from decoder: any Decoder) throws { + if let single = try? decoder.singleValueContainer(), let name = try? single.decode(String.self) { + self.name = name + self.constraints = [] + self.swiftConstraints = nil + return + } + let container = try decoder.container(keyedBy: CodingKeys.self) + self.name = try container.decode(String.self, forKey: .name) + self.constraints = try container.decodeIfPresent([String].self, forKey: .constraints) ?? [] + self.swiftConstraints = try container.decodeIfPresent([String].self, forKey: .swiftConstraints) + } + + public func encode(to encoder: any Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(name, forKey: .name) + if !constraints.isEmpty { + try container.encode(constraints, forKey: .constraints) + } + try container.encodeIfPresent(swiftConstraints, forKey: .swiftConstraints) + } +} + // MARK: - BridgeSkeleton Visitor public protocol BridgeSkeletonVisitor { @@ -554,6 +607,7 @@ public protocol BridgeSkeletonVisitor { accessLevel: BridgeJSAccessLevel ) mutating func visitImportedFunction(_ function: ImportedFunctionSkeleton) + mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) } public extension BridgeSkeletonVisitor { @@ -563,6 +617,7 @@ public extension BridgeSkeletonVisitor { accessLevel: BridgeJSAccessLevel ) {} mutating func visitImportedFunction(_ function: ImportedFunctionSkeleton) {} + mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) {} } public struct BridgeSkeletonWalker { @@ -628,6 +683,7 @@ public struct BridgeSkeletonWalker { } for proto in skeleton.protocols { for method in proto.methods { + visitor.visitProtocolMethod(method, accessLevel: currentAccessLevel) walk(method) } for property in proto.properties { @@ -778,31 +834,37 @@ public struct StructField: Codable, Equatable, Sendable { public struct ExportedStruct: Codable, Equatable, Sendable, NamespacedExportedType { public let name: String + public let jsName: String? public let swiftCallName: String public let explicitAccessControl: String? public var properties: [ExportedProperty] public var constructor: ExportedConstructor? public var methods: [ExportedFunction] public let namespace: [String]? + public let jsNamespace: [String]? public var documentation: String? public init( name: String, + jsName: String? = nil, swiftCallName: String, explicitAccessControl: String?, properties: [ExportedProperty] = [], constructor: ExportedConstructor? = nil, methods: [ExportedFunction] = [], namespace: [String]?, + jsNamespace: [String]? = nil, documentation: String? = nil ) { self.name = name + self.jsName = jsName self.swiftCallName = swiftCallName self.explicitAccessControl = explicitAccessControl self.properties = properties self.constructor = constructor self.methods = methods self.namespace = namespace + self.jsNamespace = jsNamespace self.documentation = documentation } } @@ -864,12 +926,14 @@ public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType public static let objectSuffix = "Object" public let name: String + public let jsName: String? public let swiftCallName: String public let tsFullPath: String public let explicitAccessControl: String? public var cases: [EnumCase] public let rawType: SwiftEnumRawType? public let namespace: [String]? + public let jsNamespace: [String]? public let emitStyle: EnumEmitStyle public var staticMethods: [ExportedFunction] public var staticProperties: [ExportedProperty] = [] @@ -885,33 +949,36 @@ public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType } public var valuesName: String { - emitStyle == .tsEnum ? name : "\(name)\(Self.valuesSuffix)" + emitStyle == .tsEnum ? resolvedJSName : "\(resolvedJSName)\(Self.valuesSuffix)" } public var objectTypeName: String { - "\(name)\(Self.objectSuffix)" + "\(resolvedJSName)\(Self.objectSuffix)" } public init( name: String, + jsName: String? = nil, swiftCallName: String, - tsFullPath: String, explicitAccessControl: String?, cases: [EnumCase], rawType: SwiftEnumRawType?, namespace: [String]?, + jsNamespace: [String]? = nil, emitStyle: EnumEmitStyle, staticMethods: [ExportedFunction] = [], staticProperties: [ExportedProperty] = [], documentation: String? = nil ) { self.name = name + self.jsName = jsName self.swiftCallName = swiftCallName - self.tsFullPath = tsFullPath + self.tsFullPath = ((jsNamespace ?? namespace ?? []) + [jsName ?? name]).joined(separator: ".") self.explicitAccessControl = explicitAccessControl self.cases = cases self.rawType = rawType self.namespace = namespace + self.jsNamespace = jsNamespace self.emitStyle = emitStyle self.staticMethods = staticMethods self.staticProperties = staticProperties @@ -947,25 +1014,37 @@ public struct ExportedProtocolProperty: Codable, Equatable, Sendable { } } -public struct ExportedProtocol: Codable, Equatable { +public struct ExportedProtocol: Codable, Equatable, NamespacedExportedType { public let name: String + public let jsName: String? public let methods: [ExportedFunction] public let properties: [ExportedProtocolProperty] public let namespace: [String]? + public let jsNamespace: [String]? public var documentation: String? + public var inheritedJSProtocols: [String]? + public var isGenericBridgeable: Bool? public init( name: String, + jsName: String? = nil, methods: [ExportedFunction], properties: [ExportedProtocolProperty] = [], namespace: [String]? = nil, - documentation: String? = nil + jsNamespace: [String]? = nil, + documentation: String? = nil, + inheritedJSProtocols: [String]? = nil, + isGenericBridgeable: Bool? = nil ) { self.name = name + self.jsName = jsName self.methods = methods self.properties = properties self.namespace = namespace + self.jsNamespace = jsNamespace self.documentation = documentation + self.inheritedJSProtocols = inheritedJSProtocols + self.isGenericBridgeable = isGenericBridgeable } } @@ -1007,35 +1086,41 @@ public struct ExportedFunction: Codable, Equatable, Sendable { public struct ExportedClass: Codable, NamespacedExportedType { public var name: String + public var jsName: String? public var swiftCallName: String public var explicitAccessControl: String? public var constructor: ExportedConstructor? public var methods: [ExportedFunction] public var properties: [ExportedProperty] public var namespace: [String]? + public var jsNamespace: [String]? public var identityMode: Bool? // nil = use config default, true/false = override public var documentation: String? public var isFinal: Bool? public init( name: String, + jsName: String? = nil, swiftCallName: String, explicitAccessControl: String?, constructor: ExportedConstructor? = nil, methods: [ExportedFunction], properties: [ExportedProperty] = [], namespace: [String]? = nil, + jsNamespace: [String]? = nil, identityMode: Bool? = nil, documentation: String? = nil, isFinal: Bool? = nil ) { self.name = name + self.jsName = jsName self.swiftCallName = swiftCallName self.explicitAccessControl = explicitAccessControl self.constructor = constructor self.methods = methods self.properties = properties self.namespace = namespace + self.jsNamespace = jsNamespace self.identityMode = identityMode self.documentation = documentation self.isFinal = isFinal @@ -1367,8 +1452,8 @@ public struct ImportedFunctionSkeleton: Codable { /// determine the access level of bridge-generated helpers (e.g. typed /// closure inits) that surface through this function's signature. public let accessLevel: BridgeJSAccessLevel - public let genericParameters: [String]? - public var genericParameterNames: [String] { genericParameters ?? [] } + public let genericParameters: [GenericParameter]? + public var genericParameterNames: [String] { (genericParameters ?? []).map(\.name) } public var isGeneric: Bool { !genericParameterNames.isEmpty } public var resolvedJSName: String { jsName ?? name } @@ -1382,7 +1467,7 @@ public struct ImportedFunctionSkeleton: Codable { effects: Effects = Effects(isAsync: false, isThrows: true), documentation: String? = nil, accessLevel: BridgeJSAccessLevel = .internal, - genericParameters: [String]? = nil + genericParameters: [GenericParameter]? = nil ) { self.name = name self.jsName = jsName @@ -1409,7 +1494,7 @@ public struct ImportedFunctionSkeleton: Codable { self.effects = try container.decode(Effects.self, forKey: .effects) self.documentation = try container.decodeIfPresent(String.self, forKey: .documentation) self.accessLevel = try container.decodeIfPresent(BridgeJSAccessLevel.self, forKey: .accessLevel) ?? .internal - self.genericParameters = try container.decodeIfPresent([String].self, forKey: .genericParameters) + self.genericParameters = try container.decodeIfPresent([GenericParameter].self, forKey: .genericParameters) } public func abiName(context: ImportedTypeSkeleton?) -> String { @@ -1430,14 +1515,14 @@ public struct ImportedConstructorSkeleton: Codable { /// Source access level of the originating Swift `init`. Inherits from the /// enclosing `@JSClass` type when not annotated explicitly. public let accessLevel: BridgeJSAccessLevel - public let genericParameters: [String]? - public var genericParameterNames: [String] { genericParameters ?? [] } + public let genericParameters: [GenericParameter]? + public var genericParameterNames: [String] { (genericParameters ?? []).map(\.name) } public var isGeneric: Bool { !genericParameterNames.isEmpty } public init( parameters: [Parameter], accessLevel: BridgeJSAccessLevel = .internal, - genericParameters: [String]? = nil + genericParameters: [GenericParameter]? = nil ) { self.parameters = parameters self.accessLevel = accessLevel @@ -1452,7 +1537,7 @@ public struct ImportedConstructorSkeleton: Codable { let container = try decoder.container(keyedBy: CodingKeys.self) self.parameters = try container.decode([Parameter].self, forKey: .parameters) self.accessLevel = try container.decodeIfPresent(BridgeJSAccessLevel.self, forKey: .accessLevel) ?? .internal - self.genericParameters = try container.decodeIfPresent([String].self, forKey: .genericParameters) + self.genericParameters = try container.decodeIfPresent([GenericParameter].self, forKey: .genericParameters) } public func abiName(context: ImportedTypeSkeleton) -> String { @@ -1788,6 +1873,12 @@ public struct ClosureSignatureCollectorVisitor: BridgeSkeletonVisitor { ) } + public mutating func visitProtocolMethod(_ method: ExportedFunction, accessLevel: BridgeJSAccessLevel) { + guard method.effects.isAsync else { return } + + recordInjectedSignatures(forReturnType: method.returnType, accessLevel: accessLevel) + } + private mutating func recordInjectedSignatures( forReturnType returnType: BridgeType, accessLevel: BridgeJSAccessLevel diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift index 3f0ee88db..afd87b9df 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/CrossModuleResolutionTests.swift @@ -487,6 +487,27 @@ import Testing } } + @Test func exportedClassConformanceInAnotherModule() throws { + let core = try makeSkeleton( + """ + @JS public class MyImpl { + @JS public init() {} + @JS public func ok() -> Int { 42 } + } + """, + moduleName: "Core" + ) + _ = try makeSkeleton( + """ + import Core + @JS protocol P { func ok() -> Int } + extension MyImpl: P {} + @JS func get() -> P { MyImpl() } + """, + dependencies: [(moduleName: "Core", skeleton: core)] + ) + } + // MARK: - Utillites private func resolveApp( diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift index 4f45a9880..aadf04f00 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/DiagnosticsTests.swift @@ -535,6 +535,21 @@ import Testing #expect(skeleton.exported != nil) } + @Test + func throwingStructInitProducesDiagnostic() throws { + let source = """ + @JS struct Point { + var x: Double + + @JS init(x: Double) throws(JSException) { + self.x = x + } + } + """ + let diagnostics = try #require(moduleDiagnostics(source: source)) + #expect(diagnostics.description.contains("@JS struct initializer cannot be async or throw")) + } + @Test func structWithoutExplicitInitSucceeds() throws { let source = """ @@ -696,42 +711,6 @@ import Testing } } - @Test - func jsNameOnClassDiagnostic() throws { - let source = """ - @JS("Renamed") class Box { @JS init() {} } - """ - let diagnostics = try #require(moduleDiagnostics(source: source)) - #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here")) - } - - @Test - func jsNameOnStructDiagnostic() throws { - let source = """ - @JS("Renamed") struct Box { var x: Int } - """ - let diagnostics = try #require(moduleDiagnostics(source: source)) - #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here")) - } - - @Test - func jsNameOnEnumDiagnostic() throws { - let source = """ - @JS("Renamed") enum Box { case a } - """ - let diagnostics = try #require(moduleDiagnostics(source: source)) - #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here")) - } - - @Test - func jsNameOnProtocolDiagnostic() throws { - let source = """ - @JS("Renamed") protocol Box { func run() } - """ - let diagnostics = try #require(moduleDiagnostics(source: source)) - #expect(diagnostics.description.contains("A separate name for JavaScript is not supported here")) - } - @Test func jsNameOnInitializerDiagnostic() throws { let source = """ @@ -791,4 +770,96 @@ import Testing // No line 3 in source, so output must not show a " 3 |" context line after the pointer #expect(!description.contains(" 3 |")) } + + @Test(arguments: [ + "struct MyImpl: P { func ok() -> Int { 42 } }", + "class MyImpl: P { func ok() -> Int { 42 } }", + "struct MyImpl {}\nextension MyImpl: P { func ok() -> Int { 42 } }", + ]) + func unsupportedProtocolConformer(conformer: String) { + expectDiagnostic( + source: """ + @JS protocol P { func ok() -> Int } + \(conformer) + @JS func get() -> P { MyImpl() } + """, + contains: "'MyImpl' is not a '@JS class'" + ) + } + + @Test(arguments: [ + "@JS func get() -> [P] { fatalError() }", + "@JS func get() -> P? { fatalError() }", + "@JS func get() -> [String: P] { fatalError() }", + "@JS func subscribe(_ callback: (P) -> Void) {}", + "@JS class Holder { @JS var value: P = MyImpl() }", + "@JS protocol Sink { func consume(_ value: P) }", + "@JS class Holder { @JS var callback: (P) -> Void = { _ in } }", + "@JS struct Holder { let callback: (P) -> Void }", + "@JS enum Holder { @JS static var callback: (P) -> Void = { _ in } }", + "@JS protocol Holder { var callback: (P) -> Void { get set } }", + "@JS protocol Holder { var callback: (P) -> Void { get } }", + ]) + func loweredProtocolConformer(declaration: String) { + expectDiagnostic( + source: """ + @JS protocol P { func ok() -> Int } + struct MyImpl: P { func ok() -> Int { 42 } } + \(declaration) + """, + contains: "'MyImpl' conforms to 'P'" + ) + } + + @Test(arguments: [ + "@JS func take(_ value: P) -> Int { value.ok() }", + "@JS class Holder { @JS let callback: (P) -> Void = { _ in } }", + ]) + func protocolConformerWithoutLowering(declaration: String) throws { + _ = try makeSkeleton( + """ + @JS protocol P { func ok() -> Int } + struct MyImpl: P { func ok() -> Int { 42 } } + \(declaration) + """ + ) + } + + @Test func exportedProtocolConformer() throws { + _ = try makeSkeleton( + """ + @JS protocol P { func ok() -> Int } + @JS class MyImpl: P { + @JS init() {} + @JS func ok() -> Int { 42 } + } + @JS func get() -> P { MyImpl() } + """ + ) + } + + @Test func unusedJSProtocolConformer() throws { + _ = try makeSkeleton( + """ + @JS protocol P { var id: String { get } } + @JS struct Building: P { var id: String } + @JS func describe(_ building: Building) -> String { building.id } + """ + ) + } + + @Test func protocolRefinementIsNotAConcreteConformance() throws { + _ = try makeSkeleton( + """ + @JS protocol Base { func ok() -> Int } + @JS protocol Refined: Base { func extra() -> Int } + @JS class MyImpl: Refined { + @JS init() {} + @JS func ok() -> Int { 1 } + @JS func extra() -> Int { 2 } + } + @JS func get() -> Base { MyImpl() } + """ + ) + } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportedTypeNameTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportedTypeNameTests.swift new file mode 100644 index 000000000..9d7c9a689 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ExportedTypeNameTests.swift @@ -0,0 +1,60 @@ +import Foundation +import SwiftParser +import Testing + +@testable import BridgeJSCore +@testable import BridgeJSSkeleton + +@Suite struct ExportedTypeNameTests { + private func parse(_ source: String) throws -> ExportedSkeleton { + let generator = SwiftToSkeleton( + progress: .silent, + moduleName: "TestModule", + exposeToGlobal: false, + externalModuleIndex: .empty + ) + generator.addSourceFile(Parser.parse(source: source), inputFilePath: "Types.swift") + return try #require(generator.finalize().exported) + } + + @Test + func renamedTypesKeepSwiftIdentities() throws { + let exported = try parse( + """ + @JS func box() -> SwiftBox + @JS func record() -> SwiftRecord + @JS func choice() -> SwiftChoice + @JS func delegate(_ value: SwiftDelegate) + @JS("PublicBox") class SwiftBox { @JS init() {} } + @JS("PublicRecord") struct SwiftRecord { var value: Int } + @JS("PublicChoice") enum SwiftChoice { case first } + @JS("PublicDelegate") protocol SwiftDelegate { func run() } + """ + ) + #expect(exported.classes.first?.resolvedJSName == "PublicBox") + #expect(exported.structs.first?.resolvedJSName == "PublicRecord") + #expect(exported.enums.first?.resolvedJSName == "PublicChoice") + #expect(exported.protocols.first?.resolvedJSName == "PublicDelegate") + #expect(exported.functions[0].returnType == .swiftHeapObject("SwiftBox")) + #expect(exported.functions[1].returnType == .swiftStruct("SwiftRecord")) + #expect(exported.functions[2].returnType == .caseEnum("SwiftChoice")) + #expect(exported.functions[3].parameters.first?.type == .swiftProtocol("SwiftDelegate")) + } + + @Test + func renamedParentsKeepSwiftThunkABI() throws { + let source = """ + @JS(namespace: "API") enum InternalAPI { + @JS class Item { @JS init() {} } + } + """ + let original = try parse(source) + let renamed = try parse( + source.replacingOccurrences(of: "@JS(namespace:", with: "@JS(\"PublicAPI\", namespace:") + ) + let originalThunks = try ExportSwift(progress: .silent, moduleName: "TestModule", skeleton: original).finalize() + let renamedThunks = try ExportSwift(progress: .silent, moduleName: "TestModule", skeleton: renamed).finalize() + #expect(renamedThunks == originalThunks) + #expect(renamed.classes.first?.tsFullPath == "API.PublicAPI.Item") + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift index 4a421b73b..f2ff5dc81 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/GenericImportDiagnosticsTests.swift @@ -1,9 +1,116 @@ +import Foundation import Testing +@testable import BridgeJSCore +@testable import BridgeJSLink @testable import BridgeJSSkeleton @Suite struct GenericImportDiagnosticsTests { + @Test(arguments: [ + ("protocol P {}", "BridgedSwiftGenericBridgeable & P", "unsupported constraint 'P'"), + ("@JS protocol P {}", "P", "missing the 'BridgedSwiftGenericBridgeable' constraint"), + ]) + func invalidProtocolConstraint(declaration: String, constraint: String, diagnostic: String) { + expectDiagnostic( + source: "\(declaration)\n@JSFunction func f(_ value: T) throws(JSException) -> T", + contains: diagnostic + ) + } + + @Test func qualifiedExternalProtocolConstraint() throws { + let dependency = try makeSkeleton( + "@JS public protocol Node: BridgedSwiftGenericBridgeable {}", + moduleName: "GraphKit" + ) + let decoded = try JSONDecoder().decode(BridgeJSSkeleton.self, from: JSONEncoder().encode(dependency)) + let skeleton = try makeSkeleton( + """ + import GraphKit + protocol Node {} + @JSFunction func f(_ value: T) throws(JSException) -> T + """, + dependencies: [(moduleName: "GraphKit", skeleton: decoded)] + ) + let roundTrip = try JSONDecoder().decode(BridgeJSSkeleton.self, from: JSONEncoder().encode(skeleton)) + let imported = try #require(roundTrip.imported) + #expect( + imported.children.flatMap(\.functions).first?.genericParameters == [ + GenericParameter(name: "T", constraints: ["Node"], swiftConstraints: ["GraphKit.Node"]) + ] + ) + let glue = try #require( + try ImportTS(progress: .silent, moduleName: skeleton.moduleName, skeleton: imported).finalize() + ) + #expect(glue.contains("T: BridgedSwiftGenericBridgeable & GraphKit.Node")) + #expect(roundTrip.usedExternalModules == ["GraphKit"]) + } + + @Test func refinedProtocolRequirementsAndAdapter() throws { + let skeleton = try makeSkeleton( + """ + @JS(namespace: "API") protocol Base: BridgedSwiftGenericBridgeable { + func read() -> Int + var value: Int { get set } + } + @JS protocol Middle: Base {} + @JS("PublicNode", namespace: "API") protocol Node: Middle { + var value: Int { get } + } + @JSFunction func f(_ value: T) throws(JSException) -> T + """ + ) + let exported = try #require(skeleton.exported) + let node = try #require(exported.protocols.first { $0.name == "Node" }) + #expect(node.methods.isEmpty) + #expect(node.properties.map(\.name) == ["value"]) + #expect(node.inheritedJSProtocols == ["Middle"]) + #expect(node.jsName == "PublicNode") + #expect( + exported.genericBridgeableTypeEntries.contains { + $0.swiftName == "AnyNode" && $0.bridgeType == .swiftProtocol("Node") + } + ) + let glue = try #require( + try ExportSwift(progress: .silent, moduleName: skeleton.moduleName, skeleton: exported).finalize() + ) + #expect(glue.contains("extension Base where Self: _BridgedSwiftProtocolWrapper {")) + #expect(glue.contains("extension Node where Self: _BridgedSwiftProtocolWrapper {")) + #expect(!glue.contains("extension Middle where Self")) + #expect(glue.contains("struct AnyNode: Node, _BridgedSwiftProtocolWrapper {")) + #expect(glue.contains("name: \"bjs_Base_read\"")) + #expect(!glue.contains("bjs_Node_read")) + let linked = try BridgeJSLink(skeletons: [skeleton]).link() + #expect(linked.outputDts.contains("f")) + #expect(linked.outputDts.contains("export interface PublicNode extends Middle {")) + #expect(linked.outputDts.contains("export interface Middle extends Base {")) + } + + @Test func externalProtocolRefinementIsRejected() throws { + let dependency = try makeSkeleton("@JS public protocol Base {}", moduleName: "GraphKit") + do { + _ = try makeSkeleton( + "import GraphKit\n@JS protocol Child: GraphKit.Base {}", + dependencies: [(moduleName: "GraphKit", skeleton: dependency)] + ) + Issue.record("Expected external refinement diagnostic") + } catch let error as BridgeJSCoreDiagnosticError { + #expect( + error.diagnostics.contains { + $0.diagnostic.message.contains("from another module is not supported") + } + ) + } + } + + @Test func legacyGenericParameterDecoding() throws { + let constructor = try JSONDecoder().decode( + ImportedConstructorSkeleton.self, + from: Data(#"{"parameters":[],"genericParameters":["T"]}"#.utf8) + ) + #expect(constructor.genericParameters == [GenericParameter(name: "T")]) + } + @Test func genericParameterRequiresBridgeableConstraint() { expectDiagnostic( @@ -48,7 +155,7 @@ import Testing let types = imported.children.flatMap { $0.types } let box = try #require(types.first { $0.name == "Box" }) let method = try #require(box.methods.first { $0.name == "member" }) - #expect(method.genericParameters == ["T"]) + #expect(method.genericParameters == [GenericParameter(name: "T")]) } @Test @@ -65,7 +172,7 @@ import Testing let types = imported.children.flatMap { $0.types } let box = try #require(types.first { $0.name == "Box" }) let constructor = try #require(box.constructor) - #expect(constructor.genericParameters == ["T"]) + #expect(constructor.genericParameters == [GenericParameter(name: "T")]) #expect(constructor.parameters.map(\.type) == [.generic("T")]) } @@ -205,6 +312,6 @@ import Testing let imported = try #require(skeleton.imported) let functions = imported.children.flatMap { $0.functions } let function = try #require(functions.first { $0.name == "make" }) - #expect(function.genericParameters == ["T"]) + #expect(function.genericParameters == [GenericParameter(name: "T")]) } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift index 5fd3d0226..546207cd3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/GenericImports.swift @@ -72,3 +72,25 @@ struct GenericPoint { @JSFunction func identity(_ value: T) throws(JSException) -> T @JSFunction static func box(_ value: T) throws(JSException) -> T } + +@JS protocol GenericReadable: BridgedSwiftGenericBridgeable { + func read() -> Int +} + +@JS protocol GenericWritable { + var value: Int { get set } +} + +@JS protocol GenericNode: GenericReadable, GenericWritable {} + +@JSFunction func constrainedRoundTrip(_ value: T) throws(JSException) -> T + +@JSFunction func constrainedComposition( + _ value: T +) throws(JSException) -> T + +@JSClass struct ConstrainedConsumer { + @JSFunction init(_ value: T) throws(JSException) + @JSFunction func accept(_ value: T) throws(JSException) -> T + @JSFunction static func identity(_ value: T) throws(JSException) -> T +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameTypes.swift new file mode 100644 index 000000000..40a41bf78 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSNameTypes.swift @@ -0,0 +1,11 @@ +@JS("PublicBox") final class SwiftBox { + @JS init() + @JS func copy() -> SwiftBox +} + +@JS("PublicChoice") enum SwiftChoice { + case first + case second +} + +@JS func renamedChoice(_ value: SwiftChoice) -> SwiftChoice diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift index bdb700d69..670cb29fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Protocol.swift @@ -59,6 +59,10 @@ import JavaScriptKit func createEnum() -> ExampleEnum func handleResult(_ result: Result) func getResult() -> Result + func validate(_ value: Int) throws(JSException) -> Int + func loadLabel(_ key: String) async throws(JSException) -> String + func reset() async throws(JSException) + func fetchCount() async -> Int } @JS class MyViewController { @@ -66,9 +70,9 @@ import JavaScriptKit var delegate: MyViewControllerDelegate @JS - var secondDelegate: MyViewControllerDelegate? + var secondDelegate: (any MyViewControllerDelegate)? - @JS init(delegate: MyViewControllerDelegate) { + @JS init(delegate: any MyViewControllerDelegate) { self.delegate = delegate } @@ -95,6 +99,19 @@ import JavaScriptKit @JS func sendHelper(_ helper: Helper) { delegate.onHelperUpdated(helper) } + + @JS func validateValue(_ value: Int) throws(JSException) -> Int { + return try delegate.validate(value) + } + + @JS func loadLabel(_ key: String) async throws(JSException) -> String { + return try await delegate.loadLabel(key) + } + + @JS func validatedDelegate() throws(JSException) -> MyViewControllerDelegate { + _ = try delegate.validate(0) + return delegate + } } // Protocol array support @@ -103,7 +120,7 @@ import JavaScriptKit var delegates: [MyViewControllerDelegate] @JS - var delegatesByName: [String: MyViewControllerDelegate] + var delegatesByName: [String: any MyViewControllerDelegate] @JS init(delegates: [MyViewControllerDelegate]) { self.delegates = delegates @@ -117,7 +134,7 @@ import JavaScriptKit } } -@JS func processDelegates(_ delegates: [MyViewControllerDelegate]) -> [MyViewControllerDelegate] +@JS func processDelegates(_ delegates: [any MyViewControllerDelegate]) -> [any MyViewControllerDelegate] @JS func processDelegatesByName( _ delegates: [String: MyViewControllerDelegate] diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift index cb814adf2..660d1a834 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ProtocolInClosure.swift @@ -14,5 +14,5 @@ import JavaScriptKit @JS func processRenderable(_ item: Renderable, transform: (Renderable) -> String) -> String @JS func makeRenderableFactory(defaultName: String) -> () -> Renderable -@JS func roundtripRenderable(_ callback: (Renderable) -> Renderable) -> (Renderable) -> Renderable -@JS func processOptionalRenderable(_ callback: (Renderable?) -> String) -> String +@JS func roundtripRenderable(_ callback: (any Renderable) -> any Renderable) -> (any Renderable) -> any Renderable +@JS func processOptionalRenderable(_ callback: ((any Renderable)?) -> String) -> String diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift new file mode 100644 index 000000000..d17db250d --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/ReservedWordParameters.swift @@ -0,0 +1,23 @@ +@JS func check(extension: Int, break: Double, function: Bool, in: String) {} +@JS func checkEscaped(_ `in`: String) {} + +@JS class ReservedWordBox { + @JS init(in: Int) {} + @JS func run(for: Int) {} + @JS static func make(default: Int) -> Int { 0 } +} + +@JS protocol ReservedWordDelegate { + func handle(in: Int, for: String, _ `default`: Bool) +} + +@JSFunction func importedCheck(in: Int, for: String, _ `default`: Bool) throws(JSException) + +@JS func checkEscapedCollision(in: Int, _in: Int) {} +@JS func checkGlueNameCollision(instance: Int, swift: String) {} + +@JS protocol BacktickedLabelDelegate { + func handle(`in`: Int) +} + +@JSFunction func importedSelfClosure(_ `self`: @escaping () -> Void) throws(JSException) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift index 4d2a84763..b77fc962d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift @@ -78,6 +78,10 @@ extension Vector2D { @JS func describe() -> String { return "Vector2D(\(dx), \(dy))" } + + @JS func dot(_ components: [Double]) -> Double { + return zip([dx, dy], components).map(*).reduce(0, +) + } } extension DataPoint { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs new file mode 100644 index 000000000..73299ddc0 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/StringDecoderTests.mjs @@ -0,0 +1,103 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; + +// Execute generated glue rather than a duplicate of the decoder implementation. +const source = await readFile(process.argv[2] ?? new URL('../__Snapshots__/BridgeJSLinkTests/StringReturn.js', import.meta.url), 'utf8'); +const shared = process.argv[3] === 'shared'; +const { createInstantiator } = await import(`data:text/javascript;base64,${Buffer.from(source).toString('base64')}`); +const encoder = new TextEncoder(); +const swift = { memory: { heap: [], retain: (value) => value } }; +const bridge = await createInstantiator({ getImports: () => ({}) }, swift); +const imports = {}; +bridge.addImports(imports, {}); +let words; +function instance(memory) { + return { exports: { memory, bjs_checkString: () => imports.bjs.swift_js_return_string(...words) } }; +} +let memory = new WebAssembly.Memory({ initial: 40, maximum: 41, shared }); +let wasm = instance(memory); +bridge.setInstance(wasm); +let exports = bridge.createExports(wasm); +function small(value) { + const bytes = encoder.encode(value); + assert.ok(bytes.length <= 8); + const storage = new Uint8Array(12); + storage.set(bytes.subarray(0, 8)); + storage[9] = (bytes.every((b) => b < 128) ? 0xe0 : 0xa0) | bytes.length; + const view = new DataView(storage.buffer); + return [0, 4, 8].map((offset) => view.getInt32(offset, true)); +} +function large(value, immortal = false, ptr = 64) { + const bytes = encoder.encode(value); + new Uint8Array(memory.buffer, ptr, bytes.length).set(bytes); + return [bytes.length, ptr - 20, immortal ? 0x8000 : 0]; +} +const values = ['', 'div', 'abcdefgh', 'abcdefghi', 'abcdefghij', 'abcdefé', 'abcdefgé', + 'abcdefghé', 'abcdefghié', 'abc€', 'abcdefg€', 'abc😄', 'abcdef😄', 'abcdefg😄', + '😄😄', 'éééé', 'a\0b', '\ufeff', '\ufeffx', '\ufeffabcde', '\ufeffabcdef', + 'x\ufeff', '\ufeff\ufeffx', '\ufeffabcdefghijk', + 'abc\ufeffdefghijk', '\ufeff\ufeffabcdefghijk', + // UTF-8 widths, the surrogate gap, and supplementary-plane boundaries. + '\u0080', '\u07ff', '\u0800', '\ud7ff', '\ue000', '\uffff', '\u{10000}', '\u{10ffff}']; +for (const [index, value] of values.entries()) { + if (encoder.encode(value).length <= 8) { + words = small(value); + assert.equal(exports.checkString(), value); + } + for (const immortal of [false, true]) { + // Distinct locations keep immortal cache entries faithful to Swift literals. + words = large(value, immortal, 64 + index * 64); + assert.equal(exports.checkString(), value); + assert.equal(exports.checkString(), value); + } +} +// Alternate full and short inputs: bytes outside count must never leak into the result. +for (const value of ['abcd😄', 'é', 'abcde€', '\ufeff', 'abcdefgh', '', 'x\0', '€', '\ufeff\ufeff']) { + words = small(value); + assert.equal(exports.checkString(), value); +} +// Every ASCII byte, including NUL, at every small-string length. +for (let byte = 0; byte < 128; byte++) { + for (let count = 0; count <= 8; count++) { + const value = String.fromCharCode(byte).repeat(count); + words = small(value); + assert.equal(exports.checkString(), value); + } +} +// Unexpected inline lengths must fail for both ASCII and Unicode discriminators. +for (const count of [9, 10]) { + for (const discriminator of [0xe0, 0xa0]) { + words = [0, 0, (discriminator | count) << 8]; + assert.throws(() => exports.checkString(), { + name: 'Error', + message: `Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`, + }); + } +} +words = large('first literal', true); +assert.equal(exports.checkString(), 'first literal'); +// A new instance using the same memory must preserve valid cache entries. +wasm = instance(memory); +bridge.setInstance(wasm); +exports = bridge.createExports(wasm); +assert.equal(exports.checkString(), 'first literal'); +// A different memory may reuse the same pointer/length for different contents. +memory = new WebAssembly.Memory({ initial: 40, maximum: 41, shared }); +wasm = instance(memory); +bridge.setInstance(wasm); +exports = bridge.createExports(wasm); +words = large('other literal', true); +assert.equal(exports.checkString(), 'other literal'); +// Same pointer with a different length must have a distinct key. +words = large('other', true); +assert.equal(exports.checkString(), 'other'); +// Values at the numeric-key cutoff bypass the cache. +const huge = 'x'.repeat(2 ** 21); +words = large(huge, true); +assert.equal(exports.checkString(), huge); +new Uint8Array(memory.buffer)[64] = 121; +assert.equal(exports.checkString(), 'y' + huge.slice(1)); +memory.grow(1); +words = large('after memory growth'); +assert.equal(exports.checkString(), 'after memory growth'); +console.log('String decoder regressions passed'); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/StringDecoderTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/StringDecoderTests.swift new file mode 100644 index 000000000..96449b4de --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/StringDecoderTests.swift @@ -0,0 +1,44 @@ +import Foundation +import SwiftParser +import Testing +@testable import BridgeJSCore +@testable import BridgeJSLink +@testable import TS2Swift + +@Suite struct StringDecoderTests { + @Test(arguments: [false, true]) + func generatedStringDecoder(sharedMemory: Bool) throws { + let directory = URL(fileURLWithPath: #filePath).deletingLastPathComponent() + let fixture = directory.appendingPathComponent("Inputs/MacroSwift/StringReturn.swift") + let collector = SwiftToSkeleton( + progress: .silent, + moduleName: "TestModule", + exposeToGlobal: false, + externalModuleIndex: .empty + ) + collector.addSourceFile( + Parser.parse(source: try String(contentsOf: fixture, encoding: .utf8)), + inputFilePath: fixture.path + ) + var linker = BridgeJSLink() + try linker.addSkeletonFile(data: JSONEncoder().encode(collector.finalize())) + let output = try linker.link(sharedMemory: sharedMemory) + guard let node = which("node") else { + Issue.record("Node.js is required for string decoder regression tests") + return + } + try withTemporaryDirectory { temporaryDirectory, _ in + let glue = temporaryDirectory.appendingPathComponent("bridge.js") + try output.outputJs.write(to: glue, atomically: true, encoding: .utf8) + let process = Process() + process.executableURL = node + process.arguments = [ + directory.appendingPathComponent("Inputs/StringDecoderTests.mjs").path, + glue.path, sharedMemory ? "shared" : "unshared", + ] + try process.run() + process.waitUntilExit() + #expect(process.terminationStatus == 0) + } + } +} diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift index 4483de428..7f8b3750d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Alias.swift @@ -1,6 +1,4 @@ -struct AnyHasOptionalUserId: HasOptionalUserId, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - +extension HasOptionalUserId where Self: _BridgedSwiftProtocolWrapper { var userId: Optional { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -8,6 +6,10 @@ struct AnyHasOptionalUserId: HasOptionalUserId, _BridgedSwiftProtocolWrapper { return Optional.bridgeJSLiftReturnFromSideChannel() } } +} + +struct AnyHasOptionalUserId: HasOptionalUserId, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyHasOptionalUserId(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -53,7 +55,8 @@ extension InnerTag: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_roundtripPolygon") public func _bjs_roundtripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundtripPolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = roundtripPolygon(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -64,7 +67,8 @@ public func _bjs_roundtripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeM @_cdecl("bjs_optionalPolygon") public func _bjs_optionalPolygon(_ polygonIsSome: Int32, _ polygonValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = optionalPolygon(_: Optional.bridgeJSLiftParameter(polygonIsSome, polygonValue)) + let polygon = Optional.bridgeJSLiftParameter(polygonIsSome, polygonValue) + let ret = optionalPolygon(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -75,7 +79,8 @@ public func _bjs_optionalPolygon(_ polygonIsSome: Int32, _ polygonValue: UnsafeM @_cdecl("bjs_polygonArray") public func _bjs_polygonArray() -> Void { #if arch(wasm32) - let ret = polygonArray(_: [Polygon].bridgeJSStackPop()) + let polygons = [Polygon].bridgeJSStackPop() + let ret = polygonArray(_: polygons) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -86,8 +91,9 @@ public func _bjs_polygonArray() -> Void { @_cdecl("bjs_validatePolygon") public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) + let polygon = Polygon.bridgeJSLiftParameter(polygon) do { - let ret = try validatePolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let ret = try validatePolygon(_: polygon) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -111,7 +117,8 @@ public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMu @_cdecl("bjs_makeTag") public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = makeTag(_: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = makeTag(_: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -122,7 +129,8 @@ public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutab @_cdecl("bjs_roundtripTags") public func _bjs_roundtripTags() -> Void { #if arch(wasm32) - let ret = roundtripTags(_: [Optional].bridgeJSStackPop()) + let xs = [Optional].bridgeJSStackPop() + let ret = roundtripTags(_: xs) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -133,7 +141,8 @@ public func _bjs_roundtripTags() -> Void { @_cdecl("bjs_describeUser") public func _bjs_describeUser(_ owner: Int32) -> Int32 { #if arch(wasm32) - let ret = describeUser(_: AnyHasOptionalUserId.bridgeJSLiftParameter(owner)) as! _BridgedSwiftProtocolExportable + let owner = AnyHasOptionalUserId.bridgeJSLiftParameter(owner) + let ret = _bridgeJSUnwrapProtocolExportable(describeUser(_: owner), "HasOptionalUserId") return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") @@ -144,7 +153,8 @@ public func _bjs_describeUser(_ owner: Int32) -> Int32 { @_cdecl("bjs_PolygonReference_init") public func _bjs_PolygonReference_init(_ underlying: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference(underlying: Polygon.bridgeJSLiftParameter(underlying)) + let underlying = Polygon.bridgeJSLiftParameter(underlying) + let ret = PolygonReference(underlying: underlying) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -155,7 +165,8 @@ public func _bjs_PolygonReference_init(_ underlying: UnsafeMutableRawPointer) -> @_cdecl("bjs_PolygonReference_snapshot") public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).snapshot() + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.snapshot() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -166,7 +177,9 @@ public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_PolygonReference_merge") public func _bjs_PolygonReference_merge(_ _self: UnsafeMutableRawPointer, _ other: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).merge(_: Polygon.bridgeJSLiftParameter(other)) + let other = Polygon.bridgeJSLiftParameter(other) + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.merge(_: other) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -219,7 +232,8 @@ fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPo @_cdecl("bjs_TagReference_init") public func _bjs_TagReference_init(_ underlying: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TagReference(underlying: Tag.bridgeJSLiftParameter(underlying)) + let underlying = Tag.bridgeJSLiftParameter(underlying) + let ret = TagReference(underlying: underlying) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -283,19 +297,19 @@ extension UserId: _BridgedSwiftAlias, _BridgedSwiftStackType {} #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_acceptTagged") -fileprivate func bjs_acceptTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void +fileprivate func bjs_acceptTagged_extern(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void #else -fileprivate func bjs_acceptTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void { +fileprivate func bjs_acceptTagged_extern(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_acceptTagged(_ taggedBytes: Int32, _ taggedLength: Int32) -> Void { - return bjs_acceptTagged_extern(taggedBytes, taggedLength) +@inline(never) fileprivate func bjs_acceptTagged(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void { + return bjs_acceptTagged_extern(taggedWord0, taggedWord1, taggedWord2) } func _$acceptTagged(_ tagged: Tagged) throws(JSException) -> Void { - tagged.bridgeJSWithLoweredParameter { (taggedBytes, taggedLength) in - bjs_acceptTagged(taggedBytes, taggedLength) + tagged.bridgeJSWithLoweredParameter { (taggedWord0, taggedWord1, taggedWord2) in + bjs_acceptTagged(taggedWord0, taggedWord1, taggedWord2) } if let error = _swift_js_take_exception() { throw error @@ -304,19 +318,19 @@ func _$acceptTagged(_ tagged: Tagged) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_acceptOptionalTagged") -fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void +fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void #else -fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void { +fileprivate func bjs_acceptOptionalTagged_extern(_ taggedIsSome: Int32, _ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_acceptOptionalTagged(_ taggedIsSome: Int32, _ taggedBytes: Int32, _ taggedLength: Int32) -> Void { - return bjs_acceptOptionalTagged_extern(taggedIsSome, taggedBytes, taggedLength) +@inline(never) fileprivate func bjs_acceptOptionalTagged(_ taggedIsSome: Int32, _ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Void { + return bjs_acceptOptionalTagged_extern(taggedIsSome, taggedWord0, taggedWord1, taggedWord2) } func _$acceptOptionalTagged(_ tagged: Optional) throws(JSException) -> Void { - tagged.bridgeJSWithLoweredParameter { (taggedIsSome, taggedBytes, taggedLength) in - bjs_acceptOptionalTagged(taggedIsSome, taggedBytes, taggedLength) + tagged.bridgeJSWithLoweredParameter { (taggedIsSome, taggedWord0, taggedWord1, taggedWord2) in + bjs_acceptOptionalTagged(taggedIsSome, taggedWord0, taggedWord1, taggedWord2) } if let error = _swift_js_take_exception() { throw error @@ -325,19 +339,19 @@ func _$acceptOptionalTagged(_ tagged: Optional) throws(JSException) -> V #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_roundtripTagged") -fileprivate func bjs_roundtripTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32 +fileprivate func bjs_roundtripTagged_extern(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Int32 #else -fileprivate func bjs_roundtripTagged_extern(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32 { +fileprivate func bjs_roundtripTagged_extern(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_roundtripTagged(_ taggedBytes: Int32, _ taggedLength: Int32) -> Int32 { - return bjs_roundtripTagged_extern(taggedBytes, taggedLength) +@inline(never) fileprivate func bjs_roundtripTagged(_ taggedWord0: Int32, _ taggedWord1: Int32, _ taggedWord2: Int32) -> Int32 { + return bjs_roundtripTagged_extern(taggedWord0, taggedWord1, taggedWord2) } func _$roundtripTagged(_ tagged: Tagged) throws(JSException) -> Tagged { - let ret0 = tagged.bridgeJSWithLoweredParameter { (taggedBytes, taggedLength) in - let ret = bjs_roundtripTagged(taggedBytes, taggedLength) + let ret0 = tagged.bridgeJSWithLoweredParameter { (taggedWord0, taggedWord1, taggedWord2) in + let ret = bjs_roundtripTagged(taggedWord0, taggedWord1, taggedWord2) return ret } let ret = ret0 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift index 0a208bf70..dc9c97c06 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AliasInClosure.swift @@ -53,9 +53,10 @@ extension JSTypedClosure where Signature == (Polygon) -> Int { @_cdecl("invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si") public func _invoke_swift_closure_TestModule_10TestModuleAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) + let param0 = Polygon.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Polygon) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Polygon.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -116,8 +117,8 @@ extension JSTypedClosure where Signature == () -> Polygon { public func _invoke_swift_closure_TestModule_10TestModuley_Al7Polygon(_ boxPtr: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Polygon>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure() - return result.bridgeJSLowerReturn() + let ret = closure() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -149,7 +150,8 @@ public func _bjs_makePolygonInspector() -> Int32 { @_cdecl("bjs_PolygonReference_init") public func _bjs_PolygonReference_init(_ sides: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference(sides: Int.bridgeJSLiftParameter(sides)) + let sides = Int.bridgeJSLiftParameter(sides) + let ret = PolygonReference(sides: sides) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift index 94b8eb208..2ee2de3b6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ArrayTypes.swift @@ -96,7 +96,8 @@ fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { @_cdecl("bjs_processIntArray") public func _bjs_processIntArray() -> Void { #if arch(wasm32) - let ret = processIntArray(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let ret = processIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -107,7 +108,8 @@ public func _bjs_processIntArray() -> Void { @_cdecl("bjs_processStringArray") public func _bjs_processStringArray() -> Void { #if arch(wasm32) - let ret = processStringArray(_: [String].bridgeJSStackPop()) + let values = [String].bridgeJSStackPop() + let ret = processStringArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -118,7 +120,8 @@ public func _bjs_processStringArray() -> Void { @_cdecl("bjs_processDoubleArray") public func _bjs_processDoubleArray() -> Void { #if arch(wasm32) - let ret = processDoubleArray(_: [Double].bridgeJSStackPop()) + let values = [Double].bridgeJSStackPop() + let ret = processDoubleArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -129,7 +132,8 @@ public func _bjs_processDoubleArray() -> Void { @_cdecl("bjs_processBoolArray") public func _bjs_processBoolArray() -> Void { #if arch(wasm32) - let ret = processBoolArray(_: [Bool].bridgeJSStackPop()) + let values = [Bool].bridgeJSStackPop() + let ret = processBoolArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -140,7 +144,8 @@ public func _bjs_processBoolArray() -> Void { @_cdecl("bjs_processPointArray") public func _bjs_processPointArray() -> Void { #if arch(wasm32) - let ret = processPointArray(_: [Point].bridgeJSStackPop()) + let points = [Point].bridgeJSStackPop() + let ret = processPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -151,7 +156,8 @@ public func _bjs_processPointArray() -> Void { @_cdecl("bjs_processDirectionArray") public func _bjs_processDirectionArray() -> Void { #if arch(wasm32) - let ret = processDirectionArray(_: [Direction].bridgeJSStackPop()) + let directions = [Direction].bridgeJSStackPop() + let ret = processDirectionArray(_: directions) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -162,7 +168,8 @@ public func _bjs_processDirectionArray() -> Void { @_cdecl("bjs_processStatusArray") public func _bjs_processStatusArray() -> Void { #if arch(wasm32) - let ret = processStatusArray(_: [Status].bridgeJSStackPop()) + let statuses = [Status].bridgeJSStackPop() + let ret = processStatusArray(_: statuses) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -173,7 +180,8 @@ public func _bjs_processStatusArray() -> Void { @_cdecl("bjs_sumIntArray") public func _bjs_sumIntArray() -> Int32 { #if arch(wasm32) - let ret = sumIntArray(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let ret = sumIntArray(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -184,7 +192,9 @@ public func _bjs_sumIntArray() -> Int32 { @_cdecl("bjs_findFirstPoint") public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) -> Void { #if arch(wasm32) - let ret = findFirstPoint(_: [Point].bridgeJSStackPop(), matching: String.bridgeJSLiftParameter(matchingBytes, matchingLength)) + let matching = String.bridgeJSLiftParameter(matchingBytes, matchingLength) + let points = [Point].bridgeJSStackPop() + let ret = findFirstPoint(_: points, matching: matching) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -195,7 +205,8 @@ public func _bjs_findFirstPoint(_ matchingBytes: Int32, _ matchingLength: Int32) @_cdecl("bjs_processUnsafeRawPointerArray") public func _bjs_processUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop()) + let values = [UnsafeRawPointer].bridgeJSStackPop() + let ret = processUnsafeRawPointerArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -206,7 +217,8 @@ public func _bjs_processUnsafeRawPointerArray() -> Void { @_cdecl("bjs_processUnsafeMutableRawPointerArray") public func _bjs_processUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = processUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop()) + let values = [UnsafeMutableRawPointer].bridgeJSStackPop() + let ret = processUnsafeMutableRawPointerArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -217,7 +229,8 @@ public func _bjs_processUnsafeMutableRawPointerArray() -> Void { @_cdecl("bjs_processOpaquePointerArray") public func _bjs_processOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = processOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop()) + let values = [OpaquePointer].bridgeJSStackPop() + let ret = processOpaquePointerArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -228,7 +241,8 @@ public func _bjs_processOpaquePointerArray() -> Void { @_cdecl("bjs_processOptionalIntArray") public func _bjs_processOptionalIntArray() -> Void { #if arch(wasm32) - let ret = processOptionalIntArray(_: [Optional].bridgeJSStackPop()) + let values = [Optional].bridgeJSStackPop() + let ret = processOptionalIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -239,7 +253,8 @@ public func _bjs_processOptionalIntArray() -> Void { @_cdecl("bjs_processOptionalStringArray") public func _bjs_processOptionalStringArray() -> Void { #if arch(wasm32) - let ret = processOptionalStringArray(_: [Optional].bridgeJSStackPop()) + let values = [Optional].bridgeJSStackPop() + let ret = processOptionalStringArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -250,7 +265,8 @@ public func _bjs_processOptionalStringArray() -> Void { @_cdecl("bjs_processOptionalArray") public func _bjs_processOptionalArray() -> Void { #if arch(wasm32) - let ret = processOptionalArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + let values = Optional<[Int]>.bridgeJSLiftParameter() + let ret = processOptionalArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -261,7 +277,8 @@ public func _bjs_processOptionalArray() -> Void { @_cdecl("bjs_processOptionalPointArray") public func _bjs_processOptionalPointArray() -> Void { #if arch(wasm32) - let ret = processOptionalPointArray(_: [Optional].bridgeJSStackPop()) + let points = [Optional].bridgeJSStackPop() + let ret = processOptionalPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -272,7 +289,8 @@ public func _bjs_processOptionalPointArray() -> Void { @_cdecl("bjs_processOptionalDirectionArray") public func _bjs_processOptionalDirectionArray() -> Void { #if arch(wasm32) - let ret = processOptionalDirectionArray(_: [Optional].bridgeJSStackPop()) + let directions = [Optional].bridgeJSStackPop() + let ret = processOptionalDirectionArray(_: directions) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -283,7 +301,8 @@ public func _bjs_processOptionalDirectionArray() -> Void { @_cdecl("bjs_processOptionalStatusArray") public func _bjs_processOptionalStatusArray() -> Void { #if arch(wasm32) - let ret = processOptionalStatusArray(_: [Optional].bridgeJSStackPop()) + let statuses = [Optional].bridgeJSStackPop() + let ret = processOptionalStatusArray(_: statuses) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -294,7 +313,8 @@ public func _bjs_processOptionalStatusArray() -> Void { @_cdecl("bjs_processNestedIntArray") public func _bjs_processNestedIntArray() -> Void { #if arch(wasm32) - let ret = processNestedIntArray(_: [[Int]].bridgeJSStackPop()) + let values = [[Int]].bridgeJSStackPop() + let ret = processNestedIntArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -305,7 +325,8 @@ public func _bjs_processNestedIntArray() -> Void { @_cdecl("bjs_processNestedStringArray") public func _bjs_processNestedStringArray() -> Void { #if arch(wasm32) - let ret = processNestedStringArray(_: [[String]].bridgeJSStackPop()) + let values = [[String]].bridgeJSStackPop() + let ret = processNestedStringArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -316,7 +337,8 @@ public func _bjs_processNestedStringArray() -> Void { @_cdecl("bjs_processNestedPointArray") public func _bjs_processNestedPointArray() -> Void { #if arch(wasm32) - let ret = processNestedPointArray(_: [[Point]].bridgeJSStackPop()) + let points = [[Point]].bridgeJSStackPop() + let ret = processNestedPointArray(_: points) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -327,7 +349,8 @@ public func _bjs_processNestedPointArray() -> Void { @_cdecl("bjs_processItemArray") public func _bjs_processItemArray() -> Void { #if arch(wasm32) - let ret = processItemArray(_: [Item].bridgeJSStackPop()) + let items = [Item].bridgeJSStackPop() + let ret = processItemArray(_: items) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -338,7 +361,8 @@ public func _bjs_processItemArray() -> Void { @_cdecl("bjs_processNestedItemArray") public func _bjs_processNestedItemArray() -> Void { #if arch(wasm32) - let ret = processNestedItemArray(_: [[Item]].bridgeJSStackPop()) + let items = [[Item]].bridgeJSStackPop() + let ret = processNestedItemArray(_: items) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -349,7 +373,8 @@ public func _bjs_processNestedItemArray() -> Void { @_cdecl("bjs_processJSObjectArray") public func _bjs_processJSObjectArray() -> Void { #if arch(wasm32) - let ret = processJSObjectArray(_: [JSObject].bridgeJSStackPop()) + let objects = [JSObject].bridgeJSStackPop() + let ret = processJSObjectArray(_: objects) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -360,7 +385,8 @@ public func _bjs_processJSObjectArray() -> Void { @_cdecl("bjs_processOptionalJSObjectArray") public func _bjs_processOptionalJSObjectArray() -> Void { #if arch(wasm32) - let ret = processOptionalJSObjectArray(_: [Optional].bridgeJSStackPop()) + let objects = [Optional].bridgeJSStackPop() + let ret = processOptionalJSObjectArray(_: objects) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -371,7 +397,8 @@ public func _bjs_processOptionalJSObjectArray() -> Void { @_cdecl("bjs_processNestedJSObjectArray") public func _bjs_processNestedJSObjectArray() -> Void { #if arch(wasm32) - let ret = processNestedJSObjectArray(_: [[JSObject]].bridgeJSStackPop()) + let objects = [[JSObject]].bridgeJSStackPop() + let ret = processNestedJSObjectArray(_: objects) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -382,9 +409,9 @@ public func _bjs_processNestedJSObjectArray() -> Void { @_cdecl("bjs_multiArrayParams") public func _bjs_multiArrayParams() -> Int32 { #if arch(wasm32) - let _tmp_strs = [String].bridgeJSStackPop() - let _tmp_nums = [Int].bridgeJSStackPop() - let ret = multiArrayParams(nums: _tmp_nums, strs: _tmp_strs) + let strs = [String].bridgeJSStackPop() + let nums = [Int].bridgeJSStackPop() + let ret = multiArrayParams(nums: nums, strs: strs) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -395,9 +422,9 @@ public func _bjs_multiArrayParams() -> Int32 { @_cdecl("bjs_multiOptionalArrayParams") public func _bjs_multiOptionalArrayParams() -> Int32 { #if arch(wasm32) - let _tmp_b = Optional<[String]>.bridgeJSLiftParameter() - let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter() - let ret = multiOptionalArrayParams(a: _tmp_a, b: _tmp_b) + let b = Optional<[String]>.bridgeJSLiftParameter() + let a = Optional<[Int]>.bridgeJSLiftParameter() + let ret = multiOptionalArrayParams(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -439,9 +466,9 @@ fileprivate func _bjs_Item_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> In @_cdecl("bjs_MultiArrayContainer_init") public func _bjs_MultiArrayContainer_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let _tmp_strs = [String].bridgeJSStackPop() - let _tmp_nums = [Int].bridgeJSStackPop() - let ret = MultiArrayContainer(nums: _tmp_nums, strs: _tmp_strs) + let strs = [String].bridgeJSStackPop() + let nums = [Int].bridgeJSStackPop() + let ret = MultiArrayContainer(nums: nums, strs: strs) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -452,7 +479,8 @@ public func _bjs_MultiArrayContainer_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_MultiArrayContainer_numbers_get") public func _bjs_MultiArrayContainer_numbers_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = MultiArrayContainer.bridgeJSLiftParameter(_self).numbers + let _self = MultiArrayContainer.bridgeJSLiftParameter(_self) + let ret = _self.numbers ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -463,7 +491,8 @@ public func _bjs_MultiArrayContainer_numbers_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_MultiArrayContainer_strings_get") public func _bjs_MultiArrayContainer_strings_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = MultiArrayContainer.bridgeJSLiftParameter(_self).strings + let _self = MultiArrayContainer.bridgeJSLiftParameter(_self) + let ret = _self.strings ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift index 35618554c..2d0143ea9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Async.swift @@ -100,8 +100,9 @@ public func _bjs_asyncReturnVoid() -> Int32 { @_cdecl("bjs_asyncRoundTripInt") public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = Int.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { - return await asyncRoundTripInt(_: Int.bridgeJSLiftParameter(v)) + return await asyncRoundTripInt(_: v) } #else fatalError("Only available on WebAssembly") @@ -112,8 +113,9 @@ public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripString") public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = String.bridgeJSLiftParameter(vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { - return await asyncRoundTripString(_: String.bridgeJSLiftParameter(vBytes, vLength)) + return await asyncRoundTripString(_: v) } #else fatalError("Only available on WebAssembly") @@ -124,8 +126,9 @@ public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int3 @_cdecl("bjs_asyncRoundTripBool") public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = Bool.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sb, reject: Promise_reject) { - return await asyncRoundTripBool(_: Bool.bridgeJSLiftParameter(v)) + return await asyncRoundTripBool(_: v) } #else fatalError("Only available on WebAssembly") @@ -136,8 +139,9 @@ public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripFloat") public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) + let v = Float.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sf, reject: Promise_reject) { - return await asyncRoundTripFloat(_: Float.bridgeJSLiftParameter(v)) + return await asyncRoundTripFloat(_: v) } #else fatalError("Only available on WebAssembly") @@ -148,8 +152,9 @@ public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { @_cdecl("bjs_asyncRoundTripDouble") public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) + let v = Double.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sd, reject: Promise_reject) { - return await asyncRoundTripDouble(_: Double.bridgeJSLiftParameter(v)) + return await asyncRoundTripDouble(_: v) } #else fatalError("Only available on WebAssembly") @@ -160,8 +165,9 @@ public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { @_cdecl("bjs_asyncRoundTripJSObject") public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = JSObject.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_8JSObjectC, reject: Promise_reject) { - return await asyncRoundTripJSObject(_: JSObject.bridgeJSLiftParameter(v)) + return await asyncRoundTripJSObject(_: v) } #else fatalError("Only available on WebAssembly") @@ -172,9 +178,9 @@ public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripStruct") public func _bjs_asyncRoundTripStruct() -> Int32 { #if arch(wasm32) - let _tmp_v = AsyncPoint.bridgeJSLiftParameter() + let v = AsyncPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) { - return await asyncRoundTripStruct(_: _tmp_v) + return await asyncRoundTripStruct(_: v) } #else fatalError("Only available on WebAssembly") @@ -185,9 +191,9 @@ public func _bjs_asyncRoundTripStruct() -> Int32 { @_cdecl("bjs_asyncRoundTripStructThrows") public func _bjs_asyncRoundTripStructThrows() -> Int32 { #if arch(wasm32) - let _tmp_v = AsyncPoint.bridgeJSLiftParameter() + let v = AsyncPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) { () async throws(JSException) -> AsyncPoint in - return try await asyncRoundTripStructThrows(_: _tmp_v) + return try await asyncRoundTripStructThrows(_: v) } #else fatalError("Only available on WebAssembly") @@ -212,10 +218,10 @@ public func _bjs_asyncThrowsZeroArg() -> Int32 { @_cdecl("bjs_asyncCombineStructs") public func _bjs_asyncCombineStructs() -> Int32 { #if arch(wasm32) - let _tmp_b = AsyncPoint.bridgeJSLiftParameter() - let _tmp_a = AsyncPoint.bridgeJSLiftParameter() + let b = AsyncPoint.bridgeJSLiftParameter() + let a = AsyncPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_10AsyncPointV, reject: Promise_reject) { - return await asyncCombineStructs(_: _tmp_a, _: _tmp_b) + return await asyncCombineStructs(_: a, _: b) } #else fatalError("Only available on WebAssembly") @@ -226,8 +232,9 @@ public func _bjs_asyncCombineStructs() -> Int32 { @_cdecl("bjs_asyncRoundTripEnum") public func _bjs_asyncRoundTripEnum(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = AsyncDirection.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_14AsyncDirectionO, reject: Promise_reject) { - return await asyncRoundTripEnum(_: AsyncDirection.bridgeJSLiftParameter(v)) + return await asyncRoundTripEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -238,8 +245,9 @@ public func _bjs_asyncRoundTripEnum(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripRawEnum") public func _bjs_asyncRoundTripRawEnum(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = AsyncTheme.bridgeJSLiftParameter(vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_10AsyncThemeO, reject: Promise_reject) { - return await asyncRoundTripRawEnum(_: AsyncTheme.bridgeJSLiftParameter(vBytes, vLength)) + return await asyncRoundTripRawEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -250,8 +258,9 @@ public func _bjs_asyncRoundTripRawEnum(_ vBytes: Int32, _ vLength: Int32) -> Int @_cdecl("bjs_asyncRoundTripOptionalEnum") public func _bjs_asyncRoundTripOptionalEnum(_ vIsSome: Int32, _ vValue: Int32) -> Int32 { #if arch(wasm32) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) return _bjs_makePromise(resolve: Promise_resolve_Sq14AsyncDirectionO, reject: Promise_reject) { - return await asyncRoundTripOptionalEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + return await asyncRoundTripOptionalEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -262,8 +271,9 @@ public func _bjs_asyncRoundTripOptionalEnum(_ vIsSome: Int32, _ vValue: Int32) - @_cdecl("bjs_asyncRoundTripOptionalRawEnum") public func _bjs_asyncRoundTripOptionalRawEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_Sq10AsyncThemeO, reject: Promise_reject) { - return await asyncRoundTripOptionalRawEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + return await asyncRoundTripOptionalRawEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -274,9 +284,9 @@ public func _bjs_asyncRoundTripOptionalRawEnum(_ vIsSome: Int32, _ vBytes: Int32 @_cdecl("bjs_asyncRoundTripOptionalStruct") public func _bjs_asyncRoundTripOptionalStruct() -> Int32 { #if arch(wasm32) - let _tmp_v = Optional.bridgeJSLiftParameter() + let v = Optional.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_Sq10AsyncPointV, reject: Promise_reject) { - return await asyncRoundTripOptionalStruct(_: _tmp_v) + return await asyncRoundTripOptionalStruct(_: v) } #else fatalError("Only available on WebAssembly") @@ -287,9 +297,9 @@ public func _bjs_asyncRoundTripOptionalStruct() -> Int32 { @_cdecl("bjs_asyncRoundTripStructArray") public func _bjs_asyncRoundTripStructArray() -> Int32 { #if arch(wasm32) - let _tmp_v = [AsyncPoint].bridgeJSStackPop() + let v = [AsyncPoint].bridgeJSStackPop() return _bjs_makePromise(resolve: Promise_resolve_Sa10AsyncPointV, reject: Promise_reject) { - return await asyncRoundTripStructArray(_: _tmp_v) + return await asyncRoundTripStructArray(_: v) } #else fatalError("Only available on WebAssembly") @@ -300,9 +310,9 @@ public func _bjs_asyncRoundTripStructArray() -> Int32 { @_cdecl("bjs_asyncRoundTripEnumArray") public func _bjs_asyncRoundTripEnumArray() -> Int32 { #if arch(wasm32) - let _tmp_v = [AsyncDirection].bridgeJSStackPop() + let v = [AsyncDirection].bridgeJSStackPop() return _bjs_makePromise(resolve: Promise_resolve_Sa14AsyncDirectionO, reject: Promise_reject) { - return await asyncRoundTripEnumArray(_: _tmp_v) + return await asyncRoundTripEnumArray(_: v) } #else fatalError("Only available on WebAssembly") @@ -313,9 +323,9 @@ public func _bjs_asyncRoundTripEnumArray() -> Int32 { @_cdecl("bjs_asyncRoundTripStructDictionary") public func _bjs_asyncRoundTripStructDictionary() -> Int32 { #if arch(wasm32) - let _tmp_v = [String: AsyncPoint].bridgeJSLiftParameter() + let v = [String: AsyncPoint].bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_SD10AsyncPointV, reject: Promise_reject) { - return await asyncRoundTripStructDictionary(_: _tmp_v) + return await asyncRoundTripStructDictionary(_: v) } #else fatalError("Only available on WebAssembly") @@ -326,9 +336,9 @@ public func _bjs_asyncRoundTripStructDictionary() -> Int32 { @_cdecl("bjs_asyncRoundTripEnumDictionary") public func _bjs_asyncRoundTripEnumDictionary() -> Int32 { #if arch(wasm32) - let _tmp_v = [String: AsyncDirection].bridgeJSLiftParameter() + let v = [String: AsyncDirection].bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_SD14AsyncDirectionO, reject: Promise_reject) { - return await asyncRoundTripEnumDictionary(_: _tmp_v) + return await asyncRoundTripEnumDictionary(_: v) } #else fatalError("Only available on WebAssembly") @@ -413,20 +423,20 @@ func _$Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS") -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_SS_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength) + promise_resolve_TestModule_SS(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } @@ -561,20 +571,20 @@ func _$Promise_resolve_14AsyncDirectionO(_ promise: JSObject, _ value: AsyncDire #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_10AsyncThemeO") -fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_TestModule_10AsyncThemeO_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_TestModule_10AsyncThemeO(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_TestModule_10AsyncThemeO_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_TestModule_10AsyncThemeO(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_10AsyncThemeO_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_10AsyncThemeO(_ promise: JSObject, _ value: AsyncTheme) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_TestModule_10AsyncThemeO(promiseValue, valueBytes, valueLength) + promise_resolve_TestModule_10AsyncThemeO(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } @@ -604,20 +614,20 @@ func _$Promise_resolve_Sq14AsyncDirectionO(_ promise: JSObject, _ value: Optiona #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_Sq10AsyncThemeO") -fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_TestModule_Sq10AsyncThemeO_extern(promise, valueIsSome, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_TestModule_Sq10AsyncThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_Sq10AsyncThemeO_extern(promise, valueIsSome, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_Sq10AsyncThemeO(_ promise: JSObject, _ value: Optional) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_TestModule_Sq10AsyncThemeO(promiseValue, valueIsSome, valueBytes, valueLength) + promise_resolve_TestModule_Sq10AsyncThemeO(promiseValue, valueIsSome, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift index 6776998bc..3d6691c51 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncAssociatedValueEnum.swift @@ -30,9 +30,9 @@ extension AsyncPayloadResult: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_asyncRoundTripAssociatedValueEnum") public func _bjs_asyncRoundTripAssociatedValueEnum(_ value: Int32) -> Int32 { #if arch(wasm32) - let _tmp_value = AsyncPayloadResult.bridgeJSLiftParameter(value) + let value = AsyncPayloadResult.bridgeJSLiftParameter(value) return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) { - return await asyncRoundTripAssociatedValueEnum(_: _tmp_value) + return await asyncRoundTripAssociatedValueEnum(_: value) } #else fatalError("Only available on WebAssembly") @@ -43,9 +43,9 @@ public func _bjs_asyncRoundTripAssociatedValueEnum(_ value: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripOptionalAssociatedValueEnum") public func _bjs_asyncRoundTripOptionalAssociatedValueEnum(_ valueIsSome: Int32, _ valueCaseId: Int32) -> Int32 { #if arch(wasm32) - let _tmp_value = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) return _bjs_makePromise(resolve: Promise_resolve_Sq18AsyncPayloadResultO, reject: Promise_reject) { - return await asyncRoundTripOptionalAssociatedValueEnum(_: _tmp_value) + return await asyncRoundTripOptionalAssociatedValueEnum(_: value) } #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift index 9568a4426..42cb4f52b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncImport.swift @@ -38,8 +38,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y { } extension JSTypedClosure where Signature == (sending JSValue) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, body: body, fileID: fileID, @@ -52,8 +52,9 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -99,8 +100,8 @@ private enum _BJS_Closure_10TestModules8JSObjectC_y { } extension JSTypedClosure where Signature == (sending JSObject) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSObject) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSObject) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules8JSObjectC_y, body: body, fileID: fileID, @@ -113,8 +114,9 @@ extension JSTypedClosure where Signature == (sending JSObject) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules8JSObjectC_y") public func _invoke_swift_closure_TestModule_10TestModules8JSObjectC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = JSObject.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSObject) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSObject.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -122,14 +124,14 @@ public func _invoke_swift_closure_TestModule_10TestModules8JSObjectC_y(_ boxPtr: #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y") -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -149,9 +151,9 @@ private enum _BJS_Closure_10TestModulesSS_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -161,8 +163,8 @@ private enum _BJS_Closure_10TestModulesSS_y { } extension JSTypedClosure where Signature == (sending String) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSS_y, body: body, fileID: fileID, @@ -175,8 +177,9 @@ extension JSTypedClosure where Signature == (sending String) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y") public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -222,8 +225,8 @@ private enum _BJS_Closure_10TestModulesSb_y { } extension JSTypedClosure where Signature == (sending Bool) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSb_y, body: body, fileID: fileID, @@ -236,8 +239,9 @@ extension JSTypedClosure where Signature == (sending Bool) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSb_y") public func _invoke_swift_closure_TestModule_10TestModulesSb_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = Bool.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Bool) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Bool.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -283,8 +287,8 @@ private enum _BJS_Closure_10TestModulesSd_y { } extension JSTypedClosure where Signature == (sending Double) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSd_y, body: body, fileID: fileID, @@ -297,8 +301,9 @@ extension JSTypedClosure where Signature == (sending Double) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSd_y") public func _invoke_swift_closure_TestModule_10TestModulesSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Double) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Double.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -344,8 +349,8 @@ private enum _BJS_Closure_10TestModulesSi_y { } extension JSTypedClosure where Signature == (sending Int) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Int) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Int) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSi_y, body: body, fileID: fileID, @@ -358,8 +363,9 @@ extension JSTypedClosure where Signature == (sending Int) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSi_y") public func _invoke_swift_closure_TestModule_10TestModulesSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Int.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -441,7 +447,7 @@ func _$asyncReturnVoid() async throws(JSException) -> Void { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in bjs_asyncReturnVoid(resolveRef, rejectRef) } @@ -461,9 +467,9 @@ fileprivate func bjs_asyncRoundTripInt_extern(_ resolveRef: Int32, _ rejectRef: func _$asyncRoundTripInt(_ v: Int) async throws(JSException) -> Int { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Int) -> Void>($0) + JSTypedClosure<(sending Int) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_asyncRoundTripInt(resolveRef, rejectRef, vValue) @@ -473,24 +479,24 @@ func _$asyncRoundTripInt(_ v: Int) async throws(JSException) -> Int { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_asyncRoundTripString") -fileprivate func bjs_asyncRoundTripString_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void +fileprivate func bjs_asyncRoundTripString_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void #else -fileprivate func bjs_asyncRoundTripString_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { +fileprivate func bjs_asyncRoundTripString_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_asyncRoundTripString(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { - return bjs_asyncRoundTripString_extern(resolveRef, rejectRef, vBytes, vLength) +@inline(never) fileprivate func bjs_asyncRoundTripString(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { + return bjs_asyncRoundTripString_extern(resolveRef, rejectRef, vWord0, vWord1, vWord2) } func _$asyncRoundTripString(_ v: String) async throws(JSException) -> String { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - v.bridgeJSWithLoweredParameter { (vBytes, vLength) in - bjs_asyncRoundTripString(resolveRef, rejectRef, vBytes, vLength) + v.bridgeJSWithLoweredParameter { (vWord0, vWord1, vWord2) in + bjs_asyncRoundTripString(resolveRef, rejectRef, vWord0, vWord1, vWord2) } } return resolved @@ -510,9 +516,9 @@ fileprivate func bjs_asyncRoundTripBool_extern(_ resolveRef: Int32, _ rejectRef: func _$asyncRoundTripBool(_ v: Bool) async throws(JSException) -> Bool { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Bool) -> Void>($0) + JSTypedClosure<(sending Bool) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_asyncRoundTripBool(resolveRef, rejectRef, vValue) @@ -534,9 +540,9 @@ fileprivate func bjs_asyncRoundTripDouble_extern(_ resolveRef: Int32, _ rejectRe func _$asyncRoundTripDouble(_ v: Double) async throws(JSException) -> Double { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Double) -> Void>($0) + JSTypedClosure<(sending Double) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_asyncRoundTripDouble(resolveRef, rejectRef, vValue) @@ -558,9 +564,9 @@ fileprivate func bjs_asyncRoundTripJSObject_extern(_ resolveRef: Int32, _ reject func _$asyncRoundTripJSObject(_ v: JSObject) async throws(JSException) -> JSObject { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending JSObject) -> Void>($0) + JSTypedClosure<(sending JSObject) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_asyncRoundTripJSObject(resolveRef, rejectRef, vValue) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift index 40b2a009e..4cc76ef28 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/AsyncStaticImport.swift @@ -38,8 +38,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y { } extension JSTypedClosure where Signature == (sending JSValue) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, body: body, fileID: fileID, @@ -52,8 +52,9 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -99,8 +100,8 @@ private enum _BJS_Closure_10TestModulesSd_y { } extension JSTypedClosure where Signature == (sending Double) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSd_y, body: body, fileID: fileID, @@ -113,8 +114,9 @@ extension JSTypedClosure where Signature == (sending Double) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSd_y") public func _invoke_swift_closure_TestModule_10TestModulesSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Double) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Double.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -206,9 +208,9 @@ fileprivate func bjs_AsyncBox_asyncStaticVoid_static_extern(_ resolveRef: Int32, func _$AsyncBox_asyncStaticRoundTrip(_ v: Double) async throws(JSException) -> Double { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Double) -> Void>($0) + JSTypedClosure<(sending Double) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_AsyncBox_asyncStaticRoundTrip_static(resolveRef, rejectRef, vValue) @@ -220,7 +222,7 @@ func _$AsyncBox_asyncStaticVoid() async throws(JSException) -> Void { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in bjs_AsyncBox_asyncStaticVoid_static(resolveRef, rejectRef) } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift index c9c291317..82930bdd7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ClassWithNestedTypes.swift @@ -51,7 +51,8 @@ fileprivate func _bjs_struct_lift_Account_Credentials_extern() -> Int32 { @_cdecl("bjs_Account_Credentials_init") public func _bjs_Account_Credentials_init(_ tokenBytes: Int32, _ tokenLength: Int32) -> Void { #if arch(wasm32) - let ret = Account.Credentials(token: String.bridgeJSLiftParameter(tokenBytes, tokenLength)) + let token = String.bridgeJSLiftParameter(tokenBytes, tokenLength) + let ret = Account.Credentials(token: token) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -84,7 +85,8 @@ public func _bjs_Account_Credentials_static_empty() -> Void { @_cdecl("bjs_Account_init") public func _bjs_Account_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Account(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Account(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -95,7 +97,8 @@ public func _bjs_Account_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Account_describe") public func _bjs_Account_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Account.bridgeJSLiftParameter(_self).describe() + let _self = Account.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -106,7 +109,8 @@ public func _bjs_Account_describe(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Account_name_get") public func _bjs_Account_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Account.bridgeJSLiftParameter(_self).name + let _self = Account.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -117,7 +121,9 @@ public func _bjs_Account_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Account_name_set") public func _bjs_Account_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Account.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Account.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -127,7 +133,8 @@ public func _bjs_Account_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes @_cdecl("bjs_Account_role_get") public func _bjs_Account_role_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Account.bridgeJSLiftParameter(_self).role + let _self = Account.bridgeJSLiftParameter(_self) + let ret = _self.role return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.swift index 521e8b595..66d7ee1db 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtension.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_greetFormally") public func _bjs_Greeter_greetFormally(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greetFormally() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greetFormally() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift index c8df6b29e..c3e715a55 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileExtensionOrderIndependence.swift @@ -48,7 +48,8 @@ fileprivate func _bjs_struct_lift_Archive_Record_extern() -> Int32 { @_cdecl("bjs_Archive_Record_init") public func _bjs_Archive_Record_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Archive.Record(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Archive.Record(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -59,7 +60,8 @@ public func _bjs_Archive_Record_init(_ labelBytes: Int32, _ labelLength: Int32) @_cdecl("bjs_Archive_Record_describeRecord") public func _bjs_Archive_Record_describeRecord() -> Void { #if arch(wasm32) - let ret = Archive.Record.bridgeJSLiftParameter().describeRecord() + let _self = Archive.Record.bridgeJSLiftParameter() + let ret = _self.describeRecord() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift index d12d48eef..16a94ecfb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.ReverseOrder.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_standaloneFunction") public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) + let b = FunctionB.bridgeJSLiftParameter(b) + let ret = standaloneFunction(b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +25,9 @@ public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_FunctionA_processB") public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) + let b = FunctionB.bridgeJSLiftParameter(b) + let _self = FunctionA.bridgeJSLiftParameter(_self) + let ret = _self.processB(b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,9 @@ public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: Unsaf @_cdecl("bjs_FunctionA_createB") public func _bjs_FunctionA_createB(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = FunctionA.bridgeJSLiftParameter(_self) + let ret = _self.createB(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -77,7 +82,8 @@ fileprivate func _bjs_FunctionA_wrap_extern(_ pointer: UnsafeMutableRawPointer) @_cdecl("bjs_FunctionB_init") public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = FunctionB(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -88,7 +94,8 @@ public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> Un @_cdecl("bjs_FunctionB_value_get") public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = FunctionB.bridgeJSLiftParameter(_self).value + let _self = FunctionB.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -99,7 +106,9 @@ public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_FunctionB_value_set") public func _bjs_FunctionB_value_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = FunctionB.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift index bf720af76..b2b7e36d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileFunctionTypes.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_standaloneFunction") public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = standaloneFunction(b: FunctionB.bridgeJSLiftParameter(b)) + let b = FunctionB.bridgeJSLiftParameter(b) + let ret = standaloneFunction(b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_standaloneFunction(_ b: UnsafeMutableRawPointer) -> UnsafeMutab @_cdecl("bjs_FunctionB_init") public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = FunctionB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = FunctionB(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_FunctionB_init(_ valueBytes: Int32, _ valueLength: Int32) -> Un @_cdecl("bjs_FunctionB_value_get") public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = FunctionB.bridgeJSLiftParameter(_self).value + let _self = FunctionB.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,9 @@ public func _bjs_FunctionB_value_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_FunctionB_value_set") public func _bjs_FunctionB_value_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - FunctionB.bridgeJSLiftParameter(_self).value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = FunctionB.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -87,7 +92,9 @@ public func _bjs_FunctionA_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_FunctionA_processB") public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = FunctionA.bridgeJSLiftParameter(_self).processB(b: FunctionB.bridgeJSLiftParameter(b)) + let b = FunctionB.bridgeJSLiftParameter(b) + let _self = FunctionA.bridgeJSLiftParameter(_self) + let ret = _self.processB(b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -98,7 +105,9 @@ public func _bjs_FunctionA_processB(_ _self: UnsafeMutableRawPointer, _ b: Unsaf @_cdecl("bjs_FunctionA_createB") public func _bjs_FunctionA_createB(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = FunctionA.bridgeJSLiftParameter(_self).createB(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = FunctionA.bridgeJSLiftParameter(_self) + let ret = _self.createB(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift index 7601f0f72..d5d82b80b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileNestedTypeExtension.swift @@ -5,7 +5,8 @@ extension Workspace.Kind: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum @_cdecl("bjs_Workspace_init") public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Workspace(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Workspace(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -16,7 +17,8 @@ public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsa @_cdecl("bjs_Workspace_describe") public func _bjs_Workspace_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Workspace.bridgeJSLiftParameter(_self).describe() + let _self = Workspace.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift index 7c43c393f..73a745ab0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.ReverseOrder.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_ClassA_linkedB_get") public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ClassA.bridgeJSLiftParameter(_self).linkedB + let _self = ClassA.bridgeJSLiftParameter(_self) + let ret = _self.linkedB return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,9 @@ public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_ClassA_linkedB_set") public func _bjs_ClassA_linkedB_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = ClassA.bridgeJSLiftParameter(_self) + _self.linkedB = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift index c381c7cab..e0443c55f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/CrossFileTypeResolution.swift @@ -44,7 +44,8 @@ fileprivate func _bjs_ClassB_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> @_cdecl("bjs_ClassA_linkedB_get") public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ClassA.bridgeJSLiftParameter(_self).linkedB + let _self = ClassA.bridgeJSLiftParameter(_self) + let ret = _self.linkedB return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -55,7 +56,9 @@ public func _bjs_ClassA_linkedB_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_ClassA_linkedB_set") public func _bjs_ClassA_linkedB_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - ClassA.bridgeJSLiftParameter(_self).linkedB = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = ClassA.bridgeJSLiftParameter(_self) + _self.linkedB = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift index e2e74e532..5ed3dc80d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DefaultParameters.swift @@ -137,7 +137,8 @@ fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 { @_cdecl("bjs_MathOperations_init") public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { #if arch(wasm32) - let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) + let baseValue = Double.bridgeJSLiftParameter(baseValue) + let ret = MathOperations(baseValue: baseValue) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -148,7 +149,10 @@ public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { @_cdecl("bjs_MathOperations_add") public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let _self = MathOperations.bridgeJSLiftParameter() + let ret = _self.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -159,7 +163,10 @@ public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { @_cdecl("bjs_MathOperations_multiply") public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let _self = MathOperations.bridgeJSLiftParameter() + let ret = _self.multiply(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -170,7 +177,9 @@ public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 @_cdecl("bjs_MathOperations_static_subtract") public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let ret = MathOperations.subtract(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -181,7 +190,8 @@ public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> F @_cdecl("bjs_testStringDefault") public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let ret = testStringDefault(message: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -192,7 +202,8 @@ public func _bjs_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32 @_cdecl("bjs_testNegativeIntDefault") public func _bjs_testNegativeIntDefault(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = testNegativeIntDefault(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = testNegativeIntDefault(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -203,7 +214,8 @@ public func _bjs_testNegativeIntDefault(_ value: Int32) -> Int32 { @_cdecl("bjs_testBoolDefault") public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { #if arch(wasm32) - let ret = testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) + let flag = Bool.bridgeJSLiftParameter(flag) + let ret = testBoolDefault(flag: flag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -214,7 +226,8 @@ public func _bjs_testBoolDefault(_ flag: Int32) -> Int32 { @_cdecl("bjs_testNegativeFloatDefault") public func _bjs_testNegativeFloatDefault(_ temp: Float32) -> Float32 { #if arch(wasm32) - let ret = testNegativeFloatDefault(temp: Float.bridgeJSLiftParameter(temp)) + let temp = Float.bridgeJSLiftParameter(temp) + let ret = testNegativeFloatDefault(temp: temp) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -225,7 +238,8 @@ public func _bjs_testNegativeFloatDefault(_ temp: Float32) -> Float32 { @_cdecl("bjs_testDoubleDefault") public func _bjs_testDoubleDefault(_ precision: Float64) -> Float64 { #if arch(wasm32) - let ret = testDoubleDefault(precision: Double.bridgeJSLiftParameter(precision)) + let precision = Double.bridgeJSLiftParameter(precision) + let ret = testDoubleDefault(precision: precision) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -236,7 +250,8 @@ public func _bjs_testDoubleDefault(_ precision: Float64) -> Float64 { @_cdecl("bjs_testOptionalDefault") public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = testOptionalDefault(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -247,7 +262,8 @@ public func _bjs_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ @_cdecl("bjs_testOptionalStringDefault") public func _bjs_testOptionalStringDefault(_ greetingIsSome: Int32, _ greetingBytes: Int32, _ greetingLength: Int32) -> Void { #if arch(wasm32) - let ret = testOptionalStringDefault(greeting: Optional.bridgeJSLiftParameter(greetingIsSome, greetingBytes, greetingLength)) + let greeting = Optional.bridgeJSLiftParameter(greetingIsSome, greetingBytes, greetingLength) + let ret = testOptionalStringDefault(greeting: greeting) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -258,7 +274,10 @@ public func _bjs_testOptionalStringDefault(_ greetingIsSome: Int32, _ greetingBy @_cdecl("bjs_testMultipleDefaults") public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let count = Int.bridgeJSLiftParameter(count) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let ret = testMultipleDefaults(title: title, count: count, enabled: enabled) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -269,7 +288,8 @@ public func _bjs_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, @_cdecl("bjs_testEnumDefault") public func _bjs_testEnumDefault(_ status: Int32) -> Int32 { #if arch(wasm32) - let ret = testEnumDefault(status: Status.bridgeJSLiftParameter(status)) + let status = Status.bridgeJSLiftParameter(status) + let ret = testEnumDefault(status: status) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -280,7 +300,8 @@ public func _bjs_testEnumDefault(_ status: Int32) -> Int32 { @_cdecl("bjs_testComplexInit") public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = testComplexInit(greeter: DefaultGreeter.bridgeJSLiftParameter(greeter)) + let greeter = DefaultGreeter.bridgeJSLiftParameter(greeter) + let ret = testComplexInit(greeter: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -291,7 +312,8 @@ public func _bjs_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMu @_cdecl("bjs_testEmptyInit") public func _bjs_testEmptyInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = testEmptyInit(greeter: EmptyGreeter.bridgeJSLiftParameter(greeter)) + let greeter = EmptyGreeter.bridgeJSLiftParameter(greeter) + let ret = testEmptyInit(greeter: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -302,7 +324,8 @@ public func _bjs_testEmptyInit(_ greeter: UnsafeMutableRawPointer) -> UnsafeMuta @_cdecl("bjs_testOptionalStructDefault") public func _bjs_testOptionalStructDefault() -> Void { #if arch(wasm32) - let ret = testOptionalStructDefault(point: Optional.bridgeJSLiftParameter()) + let point = Optional.bridgeJSLiftParameter() + let ret = testOptionalStructDefault(point: point) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -313,7 +336,8 @@ public func _bjs_testOptionalStructDefault() -> Void { @_cdecl("bjs_testOptionalStructWithValueDefault") public func _bjs_testOptionalStructWithValueDefault() -> Void { #if arch(wasm32) - let ret = testOptionalStructWithValueDefault(point: Optional.bridgeJSLiftParameter()) + let point = Optional.bridgeJSLiftParameter() + let ret = testOptionalStructWithValueDefault(point: point) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -324,7 +348,8 @@ public func _bjs_testOptionalStructWithValueDefault() -> Void { @_cdecl("bjs_testIntArrayDefault") public func _bjs_testIntArrayDefault() -> Void { #if arch(wasm32) - let ret = testIntArrayDefault(values: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let ret = testIntArrayDefault(values: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -335,7 +360,8 @@ public func _bjs_testIntArrayDefault() -> Void { @_cdecl("bjs_testStringArrayDefault") public func _bjs_testStringArrayDefault() -> Void { #if arch(wasm32) - let ret = testStringArrayDefault(names: [String].bridgeJSStackPop()) + let names = [String].bridgeJSStackPop() + let ret = testStringArrayDefault(names: names) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -346,7 +372,8 @@ public func _bjs_testStringArrayDefault() -> Void { @_cdecl("bjs_testDoubleArrayDefault") public func _bjs_testDoubleArrayDefault() -> Void { #if arch(wasm32) - let ret = testDoubleArrayDefault(values: [Double].bridgeJSStackPop()) + let values = [Double].bridgeJSStackPop() + let ret = testDoubleArrayDefault(values: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -357,7 +384,8 @@ public func _bjs_testDoubleArrayDefault() -> Void { @_cdecl("bjs_testBoolArrayDefault") public func _bjs_testBoolArrayDefault() -> Void { #if arch(wasm32) - let ret = testBoolArrayDefault(flags: [Bool].bridgeJSStackPop()) + let flags = [Bool].bridgeJSStackPop() + let ret = testBoolArrayDefault(flags: flags) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -368,7 +396,8 @@ public func _bjs_testBoolArrayDefault() -> Void { @_cdecl("bjs_testEmptyArrayDefault") public func _bjs_testEmptyArrayDefault() -> Void { #if arch(wasm32) - let ret = testEmptyArrayDefault(items: [Int].bridgeJSStackPop()) + let items = [Int].bridgeJSStackPop() + let ret = testEmptyArrayDefault(items: items) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -379,7 +408,10 @@ public func _bjs_testEmptyArrayDefault() -> Void { @_cdecl("bjs_testMixedWithArrayDefault") public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = testMixedWithArrayDefault(name: String.bridgeJSLiftParameter(nameBytes, nameLength), values: [Int].bridgeJSStackPop(), enabled: Bool.bridgeJSLiftParameter(enabled)) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let values = [Int].bridgeJSStackPop() + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = testMixedWithArrayDefault(name: name, values: values, enabled: enabled) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -390,7 +422,8 @@ public func _bjs_testMixedWithArrayDefault(_ nameBytes: Int32, _ nameLength: Int @_cdecl("bjs_DefaultGreeter_init") public func _bjs_DefaultGreeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DefaultGreeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = DefaultGreeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -401,7 +434,8 @@ public func _bjs_DefaultGreeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> @_cdecl("bjs_DefaultGreeter_name_get") public func _bjs_DefaultGreeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultGreeter.bridgeJSLiftParameter(_self).name + let _self = DefaultGreeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -412,7 +446,9 @@ public func _bjs_DefaultGreeter_name_get(_ _self: UnsafeMutableRawPointer) -> Vo @_cdecl("bjs_DefaultGreeter_name_set") public func _bjs_DefaultGreeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - DefaultGreeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = DefaultGreeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -495,7 +531,12 @@ fileprivate func _bjs_EmptyGreeter_wrap_extern(_ pointer: UnsafeMutableRawPointe @_cdecl("bjs_ConstructorDefaults_init") public func _bjs_ConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) + let tag = Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength) + let status = Status.bridgeJSLiftParameter(status) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let count = Int.bridgeJSLiftParameter(count) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = ConstructorDefaults(name: name, count: count, enabled: enabled, status: status, tag: tag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -506,7 +547,8 @@ public func _bjs_ConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int3 @_cdecl("bjs_ConstructorDefaults_name_get") public func _bjs_ConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).name + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -517,7 +559,9 @@ public func _bjs_ConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ConstructorDefaults_name_set") public func _bjs_ConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - ConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -527,7 +571,8 @@ public func _bjs_ConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_ConstructorDefaults_count_get") public func _bjs_ConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).count + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -538,7 +583,9 @@ public func _bjs_ConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ConstructorDefaults_count_set") public func _bjs_ConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif @@ -548,7 +595,8 @@ public func _bjs_ConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_ConstructorDefaults_enabled_get") public func _bjs_ConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).enabled + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.enabled return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -559,7 +607,9 @@ public func _bjs_ConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_ConstructorDefaults_enabled_set") public func _bjs_ConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + _self.enabled = value #else fatalError("Only available on WebAssembly") #endif @@ -569,7 +619,8 @@ public func _bjs_ConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_ConstructorDefaults_status_get") public func _bjs_ConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).status + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.status return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -580,7 +631,9 @@ public func _bjs_ConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ConstructorDefaults_status_set") public func _bjs_ConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value) + let value = Status.bridgeJSLiftParameter(value) + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + _self.status = value #else fatalError("Only available on WebAssembly") #endif @@ -590,7 +643,8 @@ public func _bjs_ConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_ConstructorDefaults_tag_get") public func _bjs_ConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = ConstructorDefaults.bridgeJSLiftParameter(_self).tag + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.tag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -601,7 +655,9 @@ public func _bjs_ConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_ConstructorDefaults_tag_set") public func _bjs_ConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - ConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = ConstructorDefaults.bridgeJSLiftParameter(_self) + _self.tag = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift index 2990eeabe..0f1dfe88a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DictionaryTypes.swift @@ -56,7 +56,8 @@ fileprivate func _bjs_struct_lift_Counters_extern() -> Int32 { @_cdecl("bjs_mirrorDictionary") public func _bjs_mirrorDictionary() -> Void { #if arch(wasm32) - let ret = mirrorDictionary(_: [String: Int].bridgeJSLiftParameter()) + let values = [String: Int].bridgeJSLiftParameter() + let ret = mirrorDictionary(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -67,7 +68,8 @@ public func _bjs_mirrorDictionary() -> Void { @_cdecl("bjs_optionalDictionary") public func _bjs_optionalDictionary() -> Void { #if arch(wasm32) - let ret = optionalDictionary(_: Optional<[String: String]>.bridgeJSLiftParameter()) + let values = Optional<[String: String]>.bridgeJSLiftParameter() + let ret = optionalDictionary(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -78,7 +80,8 @@ public func _bjs_optionalDictionary() -> Void { @_cdecl("bjs_nestedDictionary") public func _bjs_nestedDictionary() -> Void { #if arch(wasm32) - let ret = nestedDictionary(_: [String: [Int]].bridgeJSLiftParameter()) + let values = [String: [Int]].bridgeJSLiftParameter() + let ret = nestedDictionary(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -89,7 +92,8 @@ public func _bjs_nestedDictionary() -> Void { @_cdecl("bjs_boxDictionary") public func _bjs_boxDictionary() -> Void { #if arch(wasm32) - let ret = boxDictionary(_: [String: Box].bridgeJSLiftParameter()) + let boxes = [String: Box].bridgeJSLiftParameter() + let ret = boxDictionary(_: boxes) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -100,7 +104,8 @@ public func _bjs_boxDictionary() -> Void { @_cdecl("bjs_optionalBoxDictionary") public func _bjs_optionalBoxDictionary() -> Void { #if arch(wasm32) - let ret = optionalBoxDictionary(_: [String: Optional].bridgeJSLiftParameter()) + let boxes = [String: Optional].bridgeJSLiftParameter() + let ret = optionalBoxDictionary(_: boxes) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -111,7 +116,8 @@ public func _bjs_optionalBoxDictionary() -> Void { @_cdecl("bjs_roundtripCounters") public func _bjs_roundtripCounters() -> Void { #if arch(wasm32) - let ret = roundtripCounters(_: Counters.bridgeJSLiftParameter()) + let counters = Counters.bridgeJSLiftParameter() + let ret = roundtripCounters(_: counters) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift index fab694b18..05c575b73 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/DocComments.swift @@ -1,10 +1,8 @@ -struct AnyListener: Listener, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - +extension Listener where Self: _BridgedSwiftProtocolWrapper { func onEvent(id: Int) -> Void { let idValue = id.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onEvent(jsObjectValue, idValue) + bjs_Listener_onEvent(jsObjectValue, idValue) } var name: String { @@ -14,6 +12,10 @@ struct AnyListener: Listener, _BridgedSwiftProtocolWrapper { return String.bridgeJSLiftReturn(ret) } } +} + +struct AnyListener: Listener, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyListener(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -22,14 +24,14 @@ struct AnyListener: Listener, _BridgedSwiftProtocolWrapper { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Listener_onEvent") -fileprivate func _extern_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void +fileprivate func bjs_Listener_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void #else -fileprivate func _extern_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void { +fileprivate func bjs_Listener_onEvent_extern(_ jsObject: Int32, _ id: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onEvent(_ jsObject: Int32, _ id: Int32) -> Void { - return _extern_onEvent_extern(jsObject, id) +@inline(never) fileprivate func bjs_Listener_onEvent(_ jsObject: Int32, _ id: Int32) -> Void { + return bjs_Listener_onEvent_extern(jsObject, id) } #if arch(wasm32) @@ -87,7 +89,8 @@ extension Color: _BridgedSwiftCaseEnum { @_cdecl("bjs_Color_static_canonical") public func _bjs_Color_static_canonical(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Color.canonical(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Color.canonical(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -157,7 +160,9 @@ fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { @_cdecl("bjs_greet") public func _bjs_greet(_ nameBytes: Int32, _ nameLength: Int32, _ greetingBytes: Int32, _ greetingLength: Int32) -> Void { #if arch(wasm32) - let ret = greet(name: String.bridgeJSLiftParameter(nameBytes, nameLength), greeting: String.bridgeJSLiftParameter(greetingBytes, greetingLength)) + let greeting = String.bridgeJSLiftParameter(greetingBytes, greetingLength) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = greet(name: name, greeting: greeting) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -168,7 +173,9 @@ public func _bjs_greet(_ nameBytes: Int32, _ nameLength: Int32, _ greetingBytes: @_cdecl("bjs_add") public func _bjs_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -199,8 +206,9 @@ public func _bjs_hello() -> Void { @_cdecl("bjs_parseInt") public func _bjs_parseInt(_ textBytes: Int32, _ textLength: Int32) -> Int32 { #if arch(wasm32) + let text = String.bridgeJSLiftParameter(textBytes, textLength) do { - let ret = try parseInt(text: String.bridgeJSLiftParameter(textBytes, textLength)) + let ret = try parseInt(text: text) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -224,7 +232,8 @@ public func _bjs_parseInt(_ textBytes: Int32, _ textLength: Int32) -> Int32 { @_cdecl("bjs_MathUtils_double") public func _bjs_MathUtils_double(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = double(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = double(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -246,7 +255,8 @@ public func _bjs_terminator() -> Void { @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -257,7 +267,8 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -268,7 +279,8 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).name + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -279,7 +291,9 @@ public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_set") public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift index 5689b143f..8f003b1be 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAlias.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_roundtripColor") public func _bjs_roundtripColor(_ color: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundtripColor(_: Color.bridgeJSLiftParameter(color)) + let color = Color.bridgeJSLiftParameter(color) + let ret = roundtripColor(_: color) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_roundtripColor(_ color: UnsafeMutableRawPointer) -> UnsafeMutab @_cdecl("bjs_ColorBox_init") public func _bjs_ColorBox_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ColorBox(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = ColorBox(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift index 4ca3236f8..b3ce78701 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumAssociatedValue.swift @@ -408,7 +408,8 @@ fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { @_cdecl("bjs_handle") public func _bjs_handle(_ result: Int32) -> Void { #if arch(wasm32) - handle(result: APIResult.bridgeJSLiftParameter(result)) + let result = APIResult.bridgeJSLiftParameter(result) + handle(result: result) #else fatalError("Only available on WebAssembly") #endif @@ -429,7 +430,8 @@ public func _bjs_getResult() -> Void { @_cdecl("bjs_roundtripAPIResult") public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result)) + let result = APIResult.bridgeJSLiftParameter(result) + let ret = roundtripAPIResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -440,7 +442,8 @@ public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripOptionalAPIResult") public func _bjs_roundTripOptionalAPIResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalAPIResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalAPIResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -451,7 +454,8 @@ public func _bjs_roundTripOptionalAPIResult(_ resultIsSome: Int32, _ resultCaseI @_cdecl("bjs_handleComplex") public func _bjs_handleComplex(_ result: Int32) -> Void { #if arch(wasm32) - handleComplex(result: ComplexResult.bridgeJSLiftParameter(result)) + let result = ComplexResult.bridgeJSLiftParameter(result) + handleComplex(result: result) #else fatalError("Only available on WebAssembly") #endif @@ -472,7 +476,8 @@ public func _bjs_getComplexResult() -> Void { @_cdecl("bjs_roundtripComplexResult") public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result)) + let result = ComplexResult.bridgeJSLiftParameter(result) + let ret = roundtripComplexResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -483,7 +488,8 @@ public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripOptionalComplexResult") public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalComplexResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalComplexResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -494,7 +500,8 @@ public func _bjs_roundTripOptionalComplexResult(_ resultIsSome: Int32, _ resultC @_cdecl("bjs_roundTripOptionalUtilitiesResult") public func _bjs_roundTripOptionalUtilitiesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalUtilitiesResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalUtilitiesResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -505,7 +512,8 @@ public func _bjs_roundTripOptionalUtilitiesResult(_ resultIsSome: Int32, _ resul @_cdecl("bjs_roundTripOptionalNetworkingResult") public func _bjs_roundTripOptionalNetworkingResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalNetworkingResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalNetworkingResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -516,7 +524,8 @@ public func _bjs_roundTripOptionalNetworkingResult(_ resultIsSome: Int32, _ resu @_cdecl("bjs_roundTripOptionalAPIOptionalResult") public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalAPIOptionalResult(result: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalAPIOptionalResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -527,9 +536,9 @@ public func _bjs_roundTripOptionalAPIOptionalResult(_ resultIsSome: Int32, _ res @_cdecl("bjs_compareAPIResults") public func _bjs_compareAPIResults(_ result1IsSome: Int32, _ result1CaseId: Int32, _ result2IsSome: Int32, _ result2CaseId: Int32) -> Void { #if arch(wasm32) - let _tmp_result2 = Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId) - let _tmp_result1 = Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId) - let ret = compareAPIResults(result1: _tmp_result1, result2: _tmp_result2) + let result2 = Optional.bridgeJSLiftParameter(result2IsSome, result2CaseId) + let result1 = Optional.bridgeJSLiftParameter(result1IsSome, result1CaseId) + let ret = compareAPIResults(result1: result1, result2: result2) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -540,7 +549,8 @@ public func _bjs_compareAPIResults(_ result1IsSome: Int32, _ result1CaseId: Int3 @_cdecl("bjs_roundTripTypedPayloadResult") public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) + let result = TypedPayloadResult.bridgeJSLiftParameter(result) + let ret = roundTripTypedPayloadResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -551,7 +561,8 @@ public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripOptionalTypedPayloadResult") public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalTypedPayloadResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -562,7 +573,8 @@ public func _bjs_roundTripOptionalTypedPayloadResult(_ resultIsSome: Int32, _ re @_cdecl("bjs_roundTripAllTypesResult") public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) + let result = AllTypesResult.bridgeJSLiftParameter(result) + let ret = roundTripAllTypesResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -573,7 +585,8 @@ public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripOptionalAllTypesResult") public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalAllTypesResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -584,7 +597,8 @@ public func _bjs_roundTripOptionalAllTypesResult(_ resultIsSome: Int32, _ result @_cdecl("bjs_roundTripOptionalPayloadResult") public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(result)) + let result = OptionalAllTypesResult.bridgeJSLiftParameter(result) + let ret = roundTripOptionalPayloadResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -595,7 +609,8 @@ public func _bjs_roundTripOptionalPayloadResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripOptionalPayloadResultOpt") public func _bjs_roundTripOptionalPayloadResultOpt(_ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let ret = roundTripOptionalPayloadResultOpt(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift index dab981312..4b312204d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumCase.swift @@ -158,7 +158,8 @@ extension PublicStatus: _BridgedSwiftCaseEnum { @_cdecl("bjs_setDirection") public func _bjs_setDirection(_ direction: Int32) -> Void { #if arch(wasm32) - setDirection(_: Direction.bridgeJSLiftParameter(direction)) + let direction = Direction.bridgeJSLiftParameter(direction) + setDirection(_: direction) #else fatalError("Only available on WebAssembly") #endif @@ -179,7 +180,8 @@ public func _bjs_getDirection() -> Int32 { @_cdecl("bjs_processDirection") public func _bjs_processDirection(_ input: Int32) -> Int32 { #if arch(wasm32) - let ret = processDirection(_: Direction.bridgeJSLiftParameter(input)) + let input = Direction.bridgeJSLiftParameter(input) + let ret = processDirection(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -190,7 +192,8 @@ public func _bjs_processDirection(_ input: Int32) -> Int32 { @_cdecl("bjs_roundTripOptionalDirection") public func _bjs_roundTripOptionalDirection(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalDirection(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalDirection(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -201,7 +204,8 @@ public func _bjs_roundTripOptionalDirection(_ inputIsSome: Int32, _ inputValue: @_cdecl("bjs_setTSDirection") public func _bjs_setTSDirection(_ direction: Int32) -> Void { #if arch(wasm32) - setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction)) + let direction = TSDirection.bridgeJSLiftParameter(direction) + setTSDirection(_: direction) #else fatalError("Only available on WebAssembly") #endif @@ -222,7 +226,8 @@ public func _bjs_getTSDirection() -> Int32 { @_cdecl("bjs_roundTripOptionalTSDirection") public func _bjs_roundTripOptionalTSDirection(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTSDirection(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalTSDirection(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift index 9d6908bcc..659b5306a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift @@ -86,7 +86,8 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { @_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + let rootId = Int.bridgeJSLiftParameter(rootId) + let ret = GraphOperations.createGraph(rootId: rootId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -97,7 +98,8 @@ public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int @_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + let graphId = Int.bridgeJSLiftParameter(graphId) + let ret = GraphOperations.nodeCount(graphId: graphId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -108,8 +110,9 @@ public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int3 @_cdecl("bjs_Services_Graph_GraphOperations_static_validate") public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32) -> Int32 { #if arch(wasm32) + let graphId = Int.bridgeJSLiftParameter(graphId) do { - let ret = try GraphOperations.validate(graphId: Int.bridgeJSLiftParameter(graphId)) + let ret = try GraphOperations.validate(graphId: graphId) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -144,7 +147,9 @@ public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Utils_Converter_toString") public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -155,7 +160,8 @@ public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ va @_cdecl("bjs_Utils_Converter_precision_get") public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.precision return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -166,7 +172,9 @@ public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_Utils_Converter_precision_set") public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + _self.precision = value #else fatalError("Only available on WebAssembly") #endif @@ -218,7 +226,9 @@ public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Networking_API_HTTPServer_call") public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) + let method = Networking.API.Method.bridgeJSLiftParameter(method) + let _self = Networking.API.HTTPServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -270,7 +280,9 @@ public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRaw @_cdecl("bjs_Networking_APIV2_Internal_TestServer_call") public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) + let method = Internal.SupportedMethod.bridgeJSLiftParameter(method) + let _self = Internal.TestServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -322,7 +334,9 @@ public func _bjs_Formatting_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Formatting_Converter_format") public func _bjs_Formatting_Converter_format(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Formatting.Converter.bridgeJSLiftParameter(_self).format(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Formatting.Converter.bridgeJSLiftParameter(_self) + let ret = _self.format(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift index 9d6908bcc..659b5306a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift @@ -86,7 +86,8 @@ extension Internal.SupportedMethod: _BridgedSwiftCaseEnum { @_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + let rootId = Int.bridgeJSLiftParameter(rootId) + let ret = GraphOperations.createGraph(rootId: rootId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -97,7 +98,8 @@ public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int @_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + let graphId = Int.bridgeJSLiftParameter(graphId) + let ret = GraphOperations.nodeCount(graphId: graphId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -108,8 +110,9 @@ public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int3 @_cdecl("bjs_Services_Graph_GraphOperations_static_validate") public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32) -> Int32 { #if arch(wasm32) + let graphId = Int.bridgeJSLiftParameter(graphId) do { - let ret = try GraphOperations.validate(graphId: Int.bridgeJSLiftParameter(graphId)) + let ret = try GraphOperations.validate(graphId: graphId) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -144,7 +147,9 @@ public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Utils_Converter_toString") public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -155,7 +160,8 @@ public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ va @_cdecl("bjs_Utils_Converter_precision_get") public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.precision return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -166,7 +172,9 @@ public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_Utils_Converter_precision_set") public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + _self.precision = value #else fatalError("Only available on WebAssembly") #endif @@ -218,7 +226,9 @@ public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Networking_API_HTTPServer_call") public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) + let method = Networking.API.Method.bridgeJSLiftParameter(method) + let _self = Networking.API.HTTPServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -270,7 +280,9 @@ public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRaw @_cdecl("bjs_Networking_APIV2_Internal_TestServer_call") public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) + let method = Internal.SupportedMethod.bridgeJSLiftParameter(method) + let _self = Internal.TestServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -322,7 +334,9 @@ public func _bjs_Formatting_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Formatting_Converter_format") public func _bjs_Formatting_Converter_format(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Formatting.Converter.bridgeJSLiftParameter(_self).format(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Formatting.Converter.bridgeJSLiftParameter(_self) + let ret = _self.format(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift index 2dbb21422..da2e3916f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumRawType.swift @@ -38,7 +38,8 @@ extension Ratio: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { @_cdecl("bjs_setTheme") public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = Theme.bridgeJSLiftParameter(themeBytes, themeLength) + setTheme(_: theme) #else fatalError("Only available on WebAssembly") #endif @@ -59,7 +60,8 @@ public func _bjs_getTheme() -> Void { @_cdecl("bjs_roundTripOptionalTheme") public func _bjs_roundTripOptionalTheme(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTheme(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength) + let ret = roundTripOptionalTheme(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -70,7 +72,8 @@ public func _bjs_roundTripOptionalTheme(_ inputIsSome: Int32, _ inputBytes: Int3 @_cdecl("bjs_setTSTheme") public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = TSTheme.bridgeJSLiftParameter(themeBytes, themeLength) + setTSTheme(_: theme) #else fatalError("Only available on WebAssembly") #endif @@ -91,7 +94,8 @@ public func _bjs_getTSTheme() -> Void { @_cdecl("bjs_roundTripOptionalTSTheme") public func _bjs_roundTripOptionalTSTheme(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTSTheme(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength) + let ret = roundTripOptionalTSTheme(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -102,7 +106,8 @@ public func _bjs_roundTripOptionalTSTheme(_ inputIsSome: Int32, _ inputBytes: In @_cdecl("bjs_setFeatureFlag") public func _bjs_setFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Void { #if arch(wasm32) - setFeatureFlag(_: FeatureFlag.bridgeJSLiftParameter(flagBytes, flagLength)) + let flag = FeatureFlag.bridgeJSLiftParameter(flagBytes, flagLength) + setFeatureFlag(_: flag) #else fatalError("Only available on WebAssembly") #endif @@ -123,7 +128,8 @@ public func _bjs_getFeatureFlag() -> Void { @_cdecl("bjs_roundTripOptionalFeatureFlag") public func _bjs_roundTripOptionalFeatureFlag(_ inputIsSome: Int32, _ inputBytes: Int32, _ inputLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalFeatureFlag(_: Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputBytes, inputLength) + let ret = roundTripOptionalFeatureFlag(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -134,7 +140,8 @@ public func _bjs_roundTripOptionalFeatureFlag(_ inputIsSome: Int32, _ inputBytes @_cdecl("bjs_setHttpStatus") public func _bjs_setHttpStatus(_ status: Int32) -> Void { #if arch(wasm32) - setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status)) + let status = HttpStatus.bridgeJSLiftParameter(status) + setHttpStatus(_: status) #else fatalError("Only available on WebAssembly") #endif @@ -155,7 +162,8 @@ public func _bjs_getHttpStatus() -> Int32 { @_cdecl("bjs_roundTripOptionalHttpStatus") public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalHttpStatus(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalHttpStatus(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -166,7 +174,8 @@ public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: @_cdecl("bjs_setTSHttpStatus") public func _bjs_setTSHttpStatus(_ status: Int32) -> Void { #if arch(wasm32) - setTSHttpStatus(_: TSHttpStatus.bridgeJSLiftParameter(status)) + let status = TSHttpStatus.bridgeJSLiftParameter(status) + setTSHttpStatus(_: status) #else fatalError("Only available on WebAssembly") #endif @@ -187,7 +196,8 @@ public func _bjs_getTSHttpStatus() -> Int32 { @_cdecl("bjs_roundTripOptionalHttpStatus") public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalHttpStatus(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalHttpStatus(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -198,7 +208,8 @@ public func _bjs_roundTripOptionalHttpStatus(_ inputIsSome: Int32, _ inputValue: @_cdecl("bjs_setPriority") public func _bjs_setPriority(_ priority: Int32) -> Void { #if arch(wasm32) - setPriority(_: Priority.bridgeJSLiftParameter(priority)) + let priority = Priority.bridgeJSLiftParameter(priority) + setPriority(_: priority) #else fatalError("Only available on WebAssembly") #endif @@ -219,7 +230,8 @@ public func _bjs_getPriority() -> Int32 { @_cdecl("bjs_roundTripOptionalPriority") public func _bjs_roundTripOptionalPriority(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPriority(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalPriority(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -230,7 +242,8 @@ public func _bjs_roundTripOptionalPriority(_ inputIsSome: Int32, _ inputValue: I @_cdecl("bjs_setFileSize") public func _bjs_setFileSize(_ size: Int64) -> Void { #if arch(wasm32) - setFileSize(_: FileSize.bridgeJSLiftParameter(size)) + let size = FileSize.bridgeJSLiftParameter(size) + setFileSize(_: size) #else fatalError("Only available on WebAssembly") #endif @@ -251,7 +264,8 @@ public func _bjs_getFileSize() -> Int64 { @_cdecl("bjs_roundTripOptionalFileSize") public func _bjs_roundTripOptionalFileSize(_ inputIsSome: Int32, _ inputValue: Int64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalFileSize(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalFileSize(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -262,7 +276,8 @@ public func _bjs_roundTripOptionalFileSize(_ inputIsSome: Int32, _ inputValue: I @_cdecl("bjs_setUserId") public func _bjs_setUserId(_ id: Int32) -> Void { #if arch(wasm32) - setUserId(_: UserId.bridgeJSLiftParameter(id)) + let id = UserId.bridgeJSLiftParameter(id) + setUserId(_: id) #else fatalError("Only available on WebAssembly") #endif @@ -283,7 +298,8 @@ public func _bjs_getUserId() -> Int32 { @_cdecl("bjs_roundTripOptionalUserId") public func _bjs_roundTripOptionalUserId(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalUserId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalUserId(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -294,7 +310,8 @@ public func _bjs_roundTripOptionalUserId(_ inputIsSome: Int32, _ inputValue: Int @_cdecl("bjs_setTokenId") public func _bjs_setTokenId(_ token: Int32) -> Void { #if arch(wasm32) - setTokenId(_: TokenId.bridgeJSLiftParameter(token)) + let token = TokenId.bridgeJSLiftParameter(token) + setTokenId(_: token) #else fatalError("Only available on WebAssembly") #endif @@ -315,7 +332,8 @@ public func _bjs_getTokenId() -> Int32 { @_cdecl("bjs_roundTripOptionalTokenId") public func _bjs_roundTripOptionalTokenId(_ inputIsSome: Int32, _ inputValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalTokenId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalTokenId(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -326,7 +344,8 @@ public func _bjs_roundTripOptionalTokenId(_ inputIsSome: Int32, _ inputValue: In @_cdecl("bjs_setSessionId") public func _bjs_setSessionId(_ session: Int64) -> Void { #if arch(wasm32) - setSessionId(_: SessionId.bridgeJSLiftParameter(session)) + let session = SessionId.bridgeJSLiftParameter(session) + setSessionId(_: session) #else fatalError("Only available on WebAssembly") #endif @@ -347,7 +366,8 @@ public func _bjs_getSessionId() -> Int64 { @_cdecl("bjs_roundTripOptionalSessionId") public func _bjs_roundTripOptionalSessionId(_ inputIsSome: Int32, _ inputValue: Int64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalSessionId(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalSessionId(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -358,7 +378,8 @@ public func _bjs_roundTripOptionalSessionId(_ inputIsSome: Int32, _ inputValue: @_cdecl("bjs_setPrecision") public func _bjs_setPrecision(_ precision: Float32) -> Void { #if arch(wasm32) - setPrecision(_: Precision.bridgeJSLiftParameter(precision)) + let precision = Precision.bridgeJSLiftParameter(precision) + setPrecision(_: precision) #else fatalError("Only available on WebAssembly") #endif @@ -379,7 +400,8 @@ public func _bjs_getPrecision() -> Float32 { @_cdecl("bjs_roundTripOptionalPrecision") public func _bjs_roundTripOptionalPrecision(_ inputIsSome: Int32, _ inputValue: Float32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalPrecision(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalPrecision(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -390,7 +412,8 @@ public func _bjs_roundTripOptionalPrecision(_ inputIsSome: Int32, _ inputValue: @_cdecl("bjs_setRatio") public func _bjs_setRatio(_ ratio: Float64) -> Void { #if arch(wasm32) - setRatio(_: Ratio.bridgeJSLiftParameter(ratio)) + let ratio = Ratio.bridgeJSLiftParameter(ratio) + setRatio(_: ratio) #else fatalError("Only available on WebAssembly") #endif @@ -411,7 +434,8 @@ public func _bjs_getRatio() -> Float64 { @_cdecl("bjs_roundTripOptionalRatio") public func _bjs_roundTripOptionalRatio(_ inputIsSome: Int32, _ inputValue: Float64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalRatio(_: Optional.bridgeJSLiftParameter(inputIsSome, inputValue)) + let input = Optional.bridgeJSLiftParameter(inputIsSome, inputValue) + let ret = roundTripOptionalRatio(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -422,7 +446,8 @@ public func _bjs_roundTripOptionalRatio(_ inputIsSome: Int32, _ inputValue: Floa @_cdecl("bjs_processTheme") public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 { #if arch(wasm32) - let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = Theme.bridgeJSLiftParameter(themeBytes, themeLength) + let ret = processTheme(_: theme) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -433,7 +458,8 @@ public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int3 @_cdecl("bjs_convertPriority") public func _bjs_convertPriority(_ status: Int32) -> Int32 { #if arch(wasm32) - let ret = convertPriority(_: HttpStatus.bridgeJSLiftParameter(status)) + let status = HttpStatus.bridgeJSLiftParameter(status) + let ret = convertPriority(_: status) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -444,7 +470,8 @@ public func _bjs_convertPriority(_ status: Int32) -> Int32 { @_cdecl("bjs_validateSession") public func _bjs_validateSession(_ session: Int64) -> Void { #if arch(wasm32) - let ret = validateSession(_: SessionId.bridgeJSLiftParameter(session)) + let session = SessionId.bridgeJSLiftParameter(session) + let ret = validateSession(_: session) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -501,19 +528,19 @@ extension Ratio: BridgedSwiftGenericBridgeable { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_takesFeatureFlag") -fileprivate func bjs_takesFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Void +fileprivate func bjs_takesFeatureFlag_extern(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Void #else -fileprivate func bjs_takesFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Void { +fileprivate func bjs_takesFeatureFlag_extern(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_takesFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Void { - return bjs_takesFeatureFlag_extern(flagBytes, flagLength) +@inline(never) fileprivate func bjs_takesFeatureFlag(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Void { + return bjs_takesFeatureFlag_extern(flagWord0, flagWord1, flagWord2) } func _$takesFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> Void { - flag.bridgeJSWithLoweredParameter { (flagBytes, flagLength) in - bjs_takesFeatureFlag(flagBytes, flagLength) + flag.bridgeJSWithLoweredParameter { (flagWord0, flagWord1, flagWord2) in + bjs_takesFeatureFlag(flagWord0, flagWord1, flagWord2) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift index d7efa630c..9e0075c54 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionNestedTypes.swift @@ -109,7 +109,8 @@ fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32 { @_cdecl("bjs_Library_Shelf_init") public func _bjs_Library_Shelf_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.Shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Library.Shelf(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -131,7 +132,8 @@ public func _bjs_Library_Shelf_static_capacity_get() -> Int32 { @_cdecl("bjs_Library_Shelf_describeShelf") public func _bjs_Library_Shelf_describeShelf() -> Void { #if arch(wasm32) - let ret = Library.Shelf.bridgeJSLiftParameter().describeShelf() + let _self = Library.Shelf.bridgeJSLiftParameter() + let ret = _self.describeShelf() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -188,7 +190,8 @@ fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 { @_cdecl("bjs_Library_Shelf_Divider_init") public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void { #if arch(wasm32) - let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot)) + let slot = Int.bridgeJSLiftParameter(slot) + let ret = Library.Shelf.Divider(slot: slot) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -199,7 +202,8 @@ public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void { @_cdecl("bjs_roundTripMessage") public func _bjs_roundTripMessage(_ message: Int32) -> Void { #if arch(wasm32) - let ret = roundTripMessage(_: Message.bridgeJSLiftParameter(message)) + let message = Message.bridgeJSLiftParameter(message) + let ret = roundTripMessage(_: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -210,7 +214,8 @@ public func _bjs_roundTripMessage(_ message: Int32) -> Void { @_cdecl("bjs_Library_init") public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Library(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Library(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -221,7 +226,8 @@ public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Library_describe") public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).describe() + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -232,7 +238,9 @@ public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Library_rename") public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: Int32, _ titleLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).rename(_: String.bridgeJSLiftParameter(titleBytes, titleLength)) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.rename(_: title) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -243,7 +251,9 @@ public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: @_cdecl("bjs_Library_shelf") public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.shelf(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -254,7 +264,8 @@ public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: I @_cdecl("bjs_Library_name_get") public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).name + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -265,7 +276,9 @@ public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Library_name_set") public func _bjs_Library_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Library.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Library.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift index cc8091bbe..15d4462d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionOrderIndependence.swift @@ -48,7 +48,8 @@ fileprivate func _bjs_struct_lift_Depot_Crate_extern() -> Int32 { @_cdecl("bjs_Depot_Crate_init") public func _bjs_Depot_Crate_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Depot.Crate(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Depot.Crate(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -59,7 +60,8 @@ public func _bjs_Depot_Crate_init(_ labelBytes: Int32, _ labelLength: Int32) -> @_cdecl("bjs_Depot_Crate_describeCrate") public func _bjs_Depot_Crate_describeCrate() -> Void { #if arch(wasm32) - let ret = Depot.Crate.bridgeJSLiftParameter().describeCrate() + let _self = Depot.Crate.bridgeJSLiftParameter() + let ret = _self.describeCrate() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift index 7fe6db4d2..c0dbec726 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ExtensionScopeParity.swift @@ -51,7 +51,8 @@ fileprivate func _bjs_struct_lift_Meta_extern() -> Int32 { @_cdecl("bjs_Meta_init") public func _bjs_Meta_init(_ noteBytes: Int32, _ noteLength: Int32) -> Void { #if arch(wasm32) - let ret = Signal.Meta(note: String.bridgeJSLiftParameter(noteBytes, noteLength)) + let note = String.bridgeJSLiftParameter(noteBytes, noteLength) + let ret = Signal.Meta(note: note) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.swift index 544a15e7c..a648f92e0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/FixedWidthIntegers.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_roundTripInt8") public func _bjs_roundTripInt8(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripInt8(_: Int8.bridgeJSLiftParameter(v)) + let v = Int8.bridgeJSLiftParameter(v) + let ret = roundTripInt8(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_roundTripInt8(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripUInt8") public func _bjs_roundTripUInt8(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripUInt8(_: UInt8.bridgeJSLiftParameter(v)) + let v = UInt8.bridgeJSLiftParameter(v) + let ret = roundTripUInt8(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_roundTripUInt8(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripInt16") public func _bjs_roundTripInt16(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripInt16(_: Int16.bridgeJSLiftParameter(v)) + let v = Int16.bridgeJSLiftParameter(v) + let ret = roundTripInt16(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,8 @@ public func _bjs_roundTripInt16(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripUInt16") public func _bjs_roundTripUInt16(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripUInt16(_: UInt16.bridgeJSLiftParameter(v)) + let v = UInt16.bridgeJSLiftParameter(v) + let ret = roundTripUInt16(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -46,7 +50,8 @@ public func _bjs_roundTripUInt16(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripInt32") public func _bjs_roundTripInt32(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripInt32(_: Int32.bridgeJSLiftParameter(v)) + let v = Int32.bridgeJSLiftParameter(v) + let ret = roundTripInt32(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -57,7 +62,8 @@ public func _bjs_roundTripInt32(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripUInt32") public func _bjs_roundTripUInt32(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripUInt32(_: UInt32.bridgeJSLiftParameter(v)) + let v = UInt32.bridgeJSLiftParameter(v) + let ret = roundTripUInt32(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -68,7 +74,8 @@ public func _bjs_roundTripUInt32(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripInt64") public func _bjs_roundTripInt64(_ v: Int64) -> Int64 { #if arch(wasm32) - let ret = roundTripInt64(_: Int64.bridgeJSLiftParameter(v)) + let v = Int64.bridgeJSLiftParameter(v) + let ret = roundTripInt64(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -79,7 +86,8 @@ public func _bjs_roundTripInt64(_ v: Int64) -> Int64 { @_cdecl("bjs_roundTripUInt64") public func _bjs_roundTripUInt64(_ v: Int64) -> Int64 { #if arch(wasm32) - let ret = roundTripUInt64(_: UInt64.bridgeJSLiftParameter(v)) + let v = UInt64.bridgeJSLiftParameter(v) + let ret = roundTripUInt64(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json index c7f3e98ae..9f9f7a834 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.json @@ -172,7 +172,69 @@ ], "protocols" : [ + { + "isGenericBridgeable" : true, + "methods" : [ + { + "abiName" : "bjs_GenericReadable_read", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "read", + "parameters" : [ + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "name" : "GenericReadable", + "properties" : [ + + ] + }, + { + "methods" : [ + + ], + "name" : "GenericWritable", + "properties" : [ + { + "isReadonly" : false, + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + { + "inheritedJSProtocols" : [ + "GenericReadable", + "GenericWritable" + ], + "isGenericBridgeable" : true, + "methods" : [ + + ], + "name" : "GenericNode", + "properties" : [ + + ] + } ], "structs" : [ { @@ -224,7 +286,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "genericRoundTrip", "parameters" : [ @@ -251,7 +315,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "genericParse", "parameters" : [ @@ -278,8 +344,12 @@ "isThrows" : true }, "genericParameters" : [ - "T", - "U" + { + "name" : "T" + }, + { + "name" : "U" + } ], "name" : "importGenericCombine", "parameters" : [ @@ -314,8 +384,12 @@ "isThrows" : true }, "genericParameters" : [ - "T", - "t" + { + "name" : "T" + }, + { + "name" : "t" + } ], "name" : "importGenericCaseDistinct", "parameters" : [ @@ -350,7 +424,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "importGenericArray", "parameters" : [ @@ -385,7 +461,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "importGenericOptional", "parameters" : [ @@ -422,7 +500,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "importGenericDictionary", "parameters" : [ @@ -457,7 +537,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "importGenericAfterOptionalArray", "parameters" : [ @@ -495,6 +577,70 @@ "_0" : "T" } } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericNode" + ], + "name" : "T" + } + ], + "name" : "constrainedRoundTrip", + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericWritable" + ], + "name" : "T" + } + ], + "name" : "constrainedComposition", + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } } ], "types" : [ @@ -503,8 +649,12 @@ "constructor" : { "accessLevel" : "internal", "genericParameters" : [ - "T", - "U" + { + "name" : "T" + }, + { + "name" : "U" + } ], "parameters" : [ { @@ -552,7 +702,9 @@ "constructor" : { "accessLevel" : "internal", "genericParameters" : [ - "T" + { + "name" : "T" + } ], "parameters" : [ { @@ -577,7 +729,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "accept", "parameters" : [ @@ -604,7 +758,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "identity", "parameters" : [ @@ -637,7 +793,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "box", "parameters" : [ @@ -657,6 +815,105 @@ } } ] + }, + { + "accessLevel" : "internal", + "constructor" : { + "accessLevel" : "internal", + "genericParameters" : [ + { + "constraints" : [ + "GenericNode" + ], + "name" : "T" + } + ], + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ] + }, + "getters" : [ + + ], + "methods" : [ + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericNode" + ], + "name" : "T" + } + ], + "name" : "accept", + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "name" : "ConstrainedConsumer", + "setters" : [ + + ], + "staticMethods" : [ + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericNode" + ], + "name" : "T" + } + ], + "name" : "identity", + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } + } + ] } ] } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift index 01ed6196e..8a9a11197 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GenericImports.swift @@ -1,3 +1,86 @@ +extension GenericReadable where Self: _BridgedSwiftProtocolWrapper { + func read() -> Int { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_GenericReadable_read(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } +} + +struct AnyGenericReadable: GenericReadable, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyGenericReadable(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_GenericReadable_read") +fileprivate func bjs_GenericReadable_read_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_GenericReadable_read_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericReadable_read(_ jsObject: Int32) -> Int32 { + return bjs_GenericReadable_read_extern(jsObject) +} + +extension GenericWritable where Self: _BridgedSwiftProtocolWrapper { + var value: Int { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_GenericWritable_value_get(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } + set { + let newValueValue = newValue.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_GenericWritable_value_set(jsObjectValue, newValueValue) + } + } +} + +struct AnyGenericWritable: GenericWritable, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyGenericWritable(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_GenericWritable_value_get") +fileprivate func bjs_GenericWritable_value_get_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_GenericWritable_value_get_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericWritable_value_get(_ jsObject: Int32) -> Int32 { + return bjs_GenericWritable_value_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_GenericWritable_value_set") +fileprivate func bjs_GenericWritable_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void +#else +fileprivate func bjs_GenericWritable_value_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericWritable_value_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_GenericWritable_value_set_extern(jsObject, newValue) +} + +struct AnyGenericNode: GenericNode, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyGenericNode(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + extension GenericColor: _BridgedSwiftCaseEnum { @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { return bridgeJSRawValue @@ -112,7 +195,8 @@ fileprivate func _bjs_struct_lift_GenericPoint_extern() -> Int32 { @_cdecl("bjs_GenericImportBox_init") public func _bjs_GenericImportBox_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = GenericImportBox(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = GenericImportBox(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -123,7 +207,8 @@ public func _bjs_GenericImportBox_init(_ value: Int32) -> UnsafeMutableRawPointe @_cdecl("bjs_GenericImportBox_get") public func _bjs_GenericImportBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = GenericImportBox.bridgeJSLiftParameter(_self).get() + let _self = GenericImportBox.bridgeJSLiftParameter(_self) + let ret = _self.get() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -134,7 +219,8 @@ public func _bjs_GenericImportBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 @_cdecl("bjs_GenericImportBox_value_get") public func _bjs_GenericImportBox_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = GenericImportBox.bridgeJSLiftParameter(_self).value + let _self = GenericImportBox.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -145,7 +231,9 @@ public func _bjs_GenericImportBox_value_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_GenericImportBox_value_set") public func _bjs_GenericImportBox_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - GenericImportBox.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = GenericImportBox.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -202,6 +290,14 @@ extension GenericTagged: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = GenericTagged.bridgeJSMakeTypeHandle() } +extension AnyGenericReadable: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = AnyGenericReadable.bridgeJSMakeTypeHandle() +} + +extension AnyGenericNode: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = AnyGenericNode.bridgeJSMakeTypeHandle() +} + #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_genericRoundTrip") fileprivate func bjs_genericRoundTrip_extern(_ _generic0TypeId: Int32) -> Void @@ -225,19 +321,19 @@ func _$genericRoundTrip(_ value: T) throws(JSE #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_genericParse") -fileprivate func bjs_genericParse_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void +fileprivate func bjs_genericParse_extern(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void #else -fileprivate func bjs_genericParse_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void { +fileprivate func bjs_genericParse_extern(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_genericParse(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void { - return bjs_genericParse_extern(jsonBytes, jsonLength, _generic0TypeId) +@inline(never) fileprivate func bjs_genericParse(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void { + return bjs_genericParse_extern(jsonWord0, jsonWord1, jsonWord2, _generic0TypeId) } func _$genericParse(_ json: String) throws(JSException) -> T { - json.bridgeJSWithLoweredParameter { (jsonBytes, jsonLength) in - bjs_genericParse(jsonBytes, jsonLength, T.bridgeJSTypeID) + json.bridgeJSWithLoweredParameter { (jsonWord0, jsonWord1, jsonWord2) in + bjs_genericParse(jsonWord0, jsonWord1, jsonWord2, T.bridgeJSTypeID) } if let error = _swift_js_take_exception() { throw error @@ -374,23 +470,65 @@ func _$importGenericAfterOptionalArray(_ value return T.bridgeJSStackPop() } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_constrainedRoundTrip") +fileprivate func bjs_constrainedRoundTrip_extern(_ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_constrainedRoundTrip_extern(_ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_constrainedRoundTrip(_ _generic0TypeId: Int32) -> Void { + return bjs_constrainedRoundTrip_extern(_generic0TypeId) +} + +func _$constrainedRoundTrip(_ value: T) throws(JSException) -> T { + value.bridgeJSStackPush() + bjs_constrainedRoundTrip(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_constrainedComposition") +fileprivate func bjs_constrainedComposition_extern(_ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_constrainedComposition_extern(_ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_constrainedComposition(_ _generic0TypeId: Int32) -> Void { + return bjs_constrainedComposition_extern(_generic0TypeId) +} + +func _$constrainedComposition(_ value: T) throws(JSException) -> T { + value.bridgeJSStackPush() + bjs_constrainedComposition(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_GenericPairFactory_init") -fileprivate func bjs_GenericPairFactory_init_extern(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 +fileprivate func bjs_GenericPairFactory_init_extern(_ tagWord0: Int32, _ tagWord1: Int32, _ tagWord2: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 #else -fileprivate func bjs_GenericPairFactory_init_extern(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 { +fileprivate func bjs_GenericPairFactory_init_extern(_ tagWord0: Int32, _ tagWord1: Int32, _ tagWord2: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_GenericPairFactory_init(_ tagBytes: Int32, _ tagLength: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 { - return bjs_GenericPairFactory_init_extern(tagBytes, tagLength, _generic0TypeId, _generic1TypeId) +@inline(never) fileprivate func bjs_GenericPairFactory_init(_ tagWord0: Int32, _ tagWord1: Int32, _ tagWord2: Int32, _ _generic0TypeId: Int32, _ _generic1TypeId: Int32) -> Int32 { + return bjs_GenericPairFactory_init_extern(tagWord0, tagWord1, tagWord2, _generic0TypeId, _generic1TypeId) } func _$GenericPairFactory_init(_ tag: String, _ first: T, _ second: U) throws(JSException) -> JSObject { - let ret0 = tag.bridgeJSWithLoweredParameter { (tagBytes, tagLength) in + let ret0 = tag.bridgeJSWithLoweredParameter { (tagWord0, tagWord1, tagWord2) in second.bridgeJSStackPush() first.bridgeJSStackPush() - let ret = bjs_GenericPairFactory_init(tagBytes, tagLength, T.bridgeJSTypeID, U.bridgeJSTypeID) + let ret = bjs_GenericPairFactory_init(tagWord0, tagWord1, tagWord2, T.bridgeJSTypeID, U.bridgeJSTypeID) return ret } let ret = ret0 @@ -485,6 +623,70 @@ func _$GenericConsumer_identity(_ self: JSObje return T.bridgeJSStackPop() } +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ConstrainedConsumer_init") +fileprivate func bjs_ConstrainedConsumer_init_extern(_ _generic0TypeId: Int32) -> Int32 +#else +fileprivate func bjs_ConstrainedConsumer_init_extern(_ _generic0TypeId: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ConstrainedConsumer_init(_ _generic0TypeId: Int32) -> Int32 { + return bjs_ConstrainedConsumer_init_extern(_generic0TypeId) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ConstrainedConsumer_identity_static") +fileprivate func bjs_ConstrainedConsumer_identity_static_extern(_ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_ConstrainedConsumer_identity_static_extern(_ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ConstrainedConsumer_identity_static(_ _generic0TypeId: Int32) -> Void { + return bjs_ConstrainedConsumer_identity_static_extern(_generic0TypeId) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ConstrainedConsumer_accept") +fileprivate func bjs_ConstrainedConsumer_accept_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_ConstrainedConsumer_accept_extern(_ self: Int32, _ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ConstrainedConsumer_accept(_ self: Int32, _ _generic0TypeId: Int32) -> Void { + return bjs_ConstrainedConsumer_accept_extern(self, _generic0TypeId) +} + +func _$ConstrainedConsumer_init(_ value: T) throws(JSException) -> JSObject { + value.bridgeJSStackPush() + let ret = bjs_ConstrainedConsumer_init(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return JSObject.bridgeJSLiftReturn(ret) +} + +func _$ConstrainedConsumer_identity(_ value: T) throws(JSException) -> T { + value.bridgeJSStackPush() + bjs_ConstrainedConsumer_identity_static(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + +func _$ConstrainedConsumer_accept(_ self: JSObject, _ value: T) throws(JSException) -> T { + value.bridgeJSStackPush() + let selfValue = self.bridgeJSLowerParameter() + bjs_ConstrainedConsumer_accept(selfValue, T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles") fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer?, _ count: Int32) @@ -497,6 +699,8 @@ public func _bjs_TestModule_register_type_handles() { GenericColor.bridgeJSTypeID, GenericMode.bridgeJSTypeID, GenericTagged.bridgeJSTypeID, + AnyGenericReadable.bridgeJSTypeID, + AnyGenericNode.bridgeJSTypeID, ] typeIds.withUnsafeBufferPointer { buffer in _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count)) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift index 68afce080..14d4b1907 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalGetter.swift @@ -20,20 +20,20 @@ func _$console_get() throws(JSException) -> JSConsole { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") -fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void #else -fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { - return bjs_JSConsole_log_extern(self, messageBytes, messageLength) +@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + return bjs_JSConsole_log_extern(self, messageWord0, messageWord1, messageWord2) } func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { - message.bridgeJSWithLoweredParameter { (messageBytes, messageLength) in + message.bridgeJSWithLoweredParameter { (messageWord0, messageWord1, messageWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_JSConsole_log(selfValue, messageBytes, messageLength) + bjs_JSConsole_log(selfValue, messageWord0, messageWord1, messageWord2) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift index 4ba7a26fe..896c4e36d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/GlobalThisImports.swift @@ -20,19 +20,19 @@ func _$console_get() throws(JSException) -> JSConsole { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_parseInt") -fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 +fileprivate func bjs_parseInt_extern(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 #else -fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 { +fileprivate func bjs_parseInt_extern(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_parseInt(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 { - return bjs_parseInt_extern(stringBytes, stringLength) +@inline(never) fileprivate func bjs_parseInt(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 { + return bjs_parseInt_extern(stringWord0, stringWord1, stringWord2) } func _$parseInt(_ string: String) throws(JSException) -> Double { - let ret0 = string.bridgeJSWithLoweredParameter { (stringBytes, stringLength) in - let ret = bjs_parseInt(stringBytes, stringLength) + let ret0 = string.bridgeJSWithLoweredParameter { (stringWord0, stringWord1, stringWord2) in + let ret = bjs_parseInt(stringWord0, stringWord1, stringWord2) return ret } let ret = ret0 @@ -44,20 +44,20 @@ func _$parseInt(_ string: String) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_JSConsole_log") -fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void #else -fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { +fileprivate func bjs_JSConsole_log_extern(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { - return bjs_JSConsole_log_extern(self, messageBytes, messageLength) +@inline(never) fileprivate func bjs_JSConsole_log(_ self: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + return bjs_JSConsole_log_extern(self, messageWord0, messageWord1, messageWord2) } func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> Void { - message.bridgeJSWithLoweredParameter { (messageBytes, messageLength) in + message.bridgeJSWithLoweredParameter { (messageWord0, messageWord1, messageWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_JSConsole_log(selfValue, messageBytes, messageLength) + bjs_JSConsole_log(selfValue, messageWord0, messageWord1, messageWord2) } if let error = _swift_js_take_exception() { throw error @@ -66,14 +66,14 @@ func _$JSConsole_log(_ self: JSObject, _ message: String) throws(JSException) -> #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WebSocket_init") -fileprivate func bjs_WebSocket_init_extern(_ urlBytes: Int32, _ urlLength: Int32) -> Int32 +fileprivate func bjs_WebSocket_init_extern(_ urlWord0: Int32, _ urlWord1: Int32, _ urlWord2: Int32) -> Int32 #else -fileprivate func bjs_WebSocket_init_extern(_ urlBytes: Int32, _ urlLength: Int32) -> Int32 { +fileprivate func bjs_WebSocket_init_extern(_ urlWord0: Int32, _ urlWord1: Int32, _ urlWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WebSocket_init(_ urlBytes: Int32, _ urlLength: Int32) -> Int32 { - return bjs_WebSocket_init_extern(urlBytes, urlLength) +@inline(never) fileprivate func bjs_WebSocket_init(_ urlWord0: Int32, _ urlWord1: Int32, _ urlWord2: Int32) -> Int32 { + return bjs_WebSocket_init_extern(urlWord0, urlWord1, urlWord2) } #if arch(wasm32) @@ -89,8 +89,8 @@ fileprivate func bjs_WebSocket_close_extern(_ self: Int32) -> Void { } func _$WebSocket_init(_ url: String) throws(JSException) -> JSObject { - let ret0 = url.bridgeJSWithLoweredParameter { (urlBytes, urlLength) in - let ret = bjs_WebSocket_init(urlBytes, urlLength) + let ret0 = url.bridgeJSWithLoweredParameter { (urlWord0, urlWord1, urlWord2) in + let ret = bjs_WebSocket_init(urlWord0, urlWord1, urlWord2) return ret } let ret = ret0 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.swift index a79b91d56..e79cd04cd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/IdentityModeClass.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_CachedModel_init") public func _bjs_CachedModel_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = CachedModel(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = CachedModel(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_CachedModel_init(_ nameBytes: Int32, _ nameLength: Int32) -> Un @_cdecl("bjs_CachedModel_name_get") public func _bjs_CachedModel_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = CachedModel.bridgeJSLiftParameter(_self).name + let _self = CachedModel.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,9 @@ public func _bjs_CachedModel_name_get(_ _self: UnsafeMutableRawPointer) -> Void @_cdecl("bjs_CachedModel_name_set") public func _bjs_CachedModel_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - CachedModel.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = CachedModel.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -65,7 +69,8 @@ fileprivate func _bjs_CachedModel_wrap_extern(_ pointer: UnsafeMutableRawPointer @_cdecl("bjs_UncachedModel_init") public func _bjs_UncachedModel_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = UncachedModel(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = UncachedModel(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -76,7 +81,8 @@ public func _bjs_UncachedModel_init(_ value: Int32) -> UnsafeMutableRawPointer { @_cdecl("bjs_UncachedModel_value_get") public func _bjs_UncachedModel_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = UncachedModel.bridgeJSLiftParameter(_self).value + let _self = UncachedModel.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -87,7 +93,9 @@ public func _bjs_UncachedModel_value_get(_ _self: UnsafeMutableRawPointer) -> In @_cdecl("bjs_UncachedModel_value_set") public func _bjs_UncachedModel_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - UncachedModel.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = UncachedModel.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -128,7 +136,8 @@ fileprivate func _bjs_UncachedModel_wrap_extern(_ pointer: UnsafeMutableRawPoint @_cdecl("bjs_ExplicitlyUncachedModel_init") public func _bjs_ExplicitlyUncachedModel_init(_ count: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ExplicitlyUncachedModel(count: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let ret = ExplicitlyUncachedModel(count: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -139,7 +148,8 @@ public func _bjs_ExplicitlyUncachedModel_init(_ count: Int32) -> UnsafeMutableRa @_cdecl("bjs_ExplicitlyUncachedModel_count_get") public func _bjs_ExplicitlyUncachedModel_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ExplicitlyUncachedModel.bridgeJSLiftParameter(_self).count + let _self = ExplicitlyUncachedModel.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -150,7 +160,9 @@ public func _bjs_ExplicitlyUncachedModel_count_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_ExplicitlyUncachedModel_count_set") public func _bjs_ExplicitlyUncachedModel_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ExplicitlyUncachedModel.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = ExplicitlyUncachedModel.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift index 12abbd1e6..a501dd2f5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportArray.swift @@ -63,21 +63,21 @@ func _$optionalArrayThenArray(_ a: Optional<[Int]>, _ b: [Int]) throws(JSExcepti #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_borrowedStringAroundStackParams") -fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 +fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 #else -fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 { +fileprivate func bjs_borrowedStringAroundStackParams_extern(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_borrowedStringAroundStackParams(_ sBytes: Int32, _ sLength: Int32) -> Int32 { - return bjs_borrowedStringAroundStackParams_extern(sBytes, sLength) +@inline(never) fileprivate func bjs_borrowedStringAroundStackParams(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 { + return bjs_borrowedStringAroundStackParams_extern(sWord0, sWord1, sWord2) } func _$borrowedStringAroundStackParams(_ s: String, _ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> Int { - let ret0 = s.bridgeJSWithLoweredParameter { (sBytes, sLength) in + let ret0 = s.bridgeJSWithLoweredParameter { (sWord0, sWord1, sWord2) in let _ = b.bridgeJSLowerParameter() let _ = a.bridgeJSLowerParameter() - let ret = bjs_borrowedStringAroundStackParams(sBytes, sLength) + let ret = bjs_borrowedStringAroundStackParams(sWord0, sWord1, sWord2) return ret } let ret = ret0 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift index b9fddf706..8c98946bc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ImportedTypeInExportedInterface.swift @@ -75,7 +75,8 @@ public func _bjs_makeFoo() -> Int32 { @_cdecl("bjs_processFooArray") public func _bjs_processFooArray() -> Void { #if arch(wasm32) - let ret = processFooArray(_: [Foo].bridgeJSStackPop()) + let foos = [Foo].bridgeJSStackPop() + let ret = processFooArray(_: foos) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -86,7 +87,8 @@ public func _bjs_processFooArray() -> Void { @_cdecl("bjs_processOptionalFooArray") public func _bjs_processOptionalFooArray() -> Void { #if arch(wasm32) - let ret = processOptionalFooArray(_: [Optional].bridgeJSStackPop()) + let foos = [Optional].bridgeJSStackPop() + let ret = processOptionalFooArray(_: foos) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -97,7 +99,8 @@ public func _bjs_processOptionalFooArray() -> Void { @_cdecl("bjs_roundtripFooContainer") public func _bjs_roundtripFooContainer() -> Void { #if arch(wasm32) - let ret = roundtripFooContainer(_: FooContainer.bridgeJSLiftParameter()) + let container = FooContainer.bridgeJSLiftParameter() + let ret = roundtripFooContainer(_: container) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift index f82632737..3adaeb88f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/InvalidPropertyNames.swift @@ -136,14 +136,14 @@ fileprivate func bjs_WeirdNaming_Any_get_extern(_ self: Int32) -> Int32 { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_normalProperty_set") -fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeirdNaming_normalProperty_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeirdNaming_normalProperty_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeirdNaming_normalProperty_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeirdNaming_normalProperty_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -172,14 +172,14 @@ fileprivate func bjs_WeirdNaming__123invalidStart_set_extern(_ self: Int32, _ ne #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_property_with_spaces_set") -fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeirdNaming_property_with_spaces_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeirdNaming_property_with_spaces_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeirdNaming_property_with_spaces_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeirdNaming_property_with_spaces_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -196,38 +196,38 @@ fileprivate func bjs_WeirdNaming__specialChar_set_extern(_ self: Int32, _ newVal #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_constructor_set") -fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeirdNaming_constructor_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeirdNaming_constructor_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeirdNaming_constructor_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeirdNaming_constructor_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_for_set") -fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeirdNaming_for_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeirdNaming_for_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeirdNaming_for_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeirdNaming_for_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WeirdNaming_any_set") -fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeirdNaming_any_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeirdNaming_any_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeirdNaming_any_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeirdNaming_any_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -327,9 +327,9 @@ func _$WeirdNaming_Any_get(_ self: JSObject) throws(JSException) -> String { } func _$WeirdNaming_normalProperty_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_normalProperty_set(selfValue, newValueBytes, newValueLength) + bjs_WeirdNaming_normalProperty_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -355,9 +355,9 @@ func _$WeirdNaming__123invalidStart_set(_ self: JSObject, _ newValue: Bool) thro } func _$WeirdNaming_property_with_spaces_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_property_with_spaces_set(selfValue, newValueBytes, newValueLength) + bjs_WeirdNaming_property_with_spaces_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -374,9 +374,9 @@ func _$WeirdNaming__specialChar_set(_ self: JSObject, _ newValue: Double) throws } func _$WeirdNaming_constructor_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_constructor_set(selfValue, newValueBytes, newValueLength) + bjs_WeirdNaming_constructor_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -384,9 +384,9 @@ func _$WeirdNaming_constructor_set(_ self: JSObject, _ newValue: String) throws( } func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_for_set(selfValue, newValueBytes, newValueLength) + bjs_WeirdNaming_for_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -394,9 +394,9 @@ func _$WeirdNaming_for_set(_ self: JSObject, _ newValue: String) throws(JSExcept } func _$WeirdNaming_any_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeirdNaming_any_set(selfValue, newValueBytes, newValueLength) + bjs_WeirdNaming_any_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift index 37009f318..95e020b23 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClass.swift @@ -20,14 +20,14 @@ func _$returnAnimatable() throws(JSException) -> Animatable { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_init") -fileprivate func bjs_Greeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32) -> Int32 +fileprivate func bjs_Greeter_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Int32 #else -fileprivate func bjs_Greeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32) -> Int32 { +fileprivate func bjs_Greeter_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Int32 { - return bjs_Greeter_init_extern(nameBytes, nameLength) +@inline(never) fileprivate func bjs_Greeter_init(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Int32 { + return bjs_Greeter_init_extern(nameWord0, nameWord1, nameWord2) } #if arch(wasm32) @@ -56,14 +56,14 @@ fileprivate func bjs_Greeter_age_get_extern(_ self: Int32) -> Float64 { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_name_set") -fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_Greeter_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_Greeter_name_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_Greeter_name_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_Greeter_name_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -80,19 +80,19 @@ fileprivate func bjs_Greeter_greet_extern(_ self: Int32) -> Int32 { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Greeter_changeName") -fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void +fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void #else -fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +fileprivate func bjs_Greeter_changeName_extern(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Greeter_changeName(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { - return bjs_Greeter_changeName_extern(self, nameBytes, nameLength) +@inline(never) fileprivate func bjs_Greeter_changeName(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { + return bjs_Greeter_changeName_extern(self, nameWord0, nameWord1, nameWord2) } func _$Greeter_init(_ name: String) throws(JSException) -> JSObject { - let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in - let ret = bjs_Greeter_init(nameBytes, nameLength) + let ret0 = name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in + let ret = bjs_Greeter_init(nameWord0, nameWord1, nameWord2) return ret } let ret = ret0 @@ -121,9 +121,9 @@ func _$Greeter_age_get(_ self: JSObject) throws(JSException) -> Double { } func _$Greeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_Greeter_name_set(selfValue, newValueBytes, newValueLength) + bjs_Greeter_name_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -140,9 +140,9 @@ func _$Greeter_greet(_ self: JSObject) throws(JSException) -> String { } func _$Greeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void { - name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in + name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_Greeter_changeName(selfValue, nameBytes, nameLength) + bjs_Greeter_changeName(selfValue, nameWord0, nameWord1, nameWord2) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift index 4baf8d0f0..69de3b2ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModule.swift @@ -40,19 +40,19 @@ func _$localDefaultExport_get() throws(JSException) -> JSObject { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_nodeBasename") -fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 +fileprivate func bjs_nodeBasename_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 #else -fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { +fileprivate func bjs_nodeBasename_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_nodeBasename(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { - return bjs_nodeBasename_extern(pathBytes, pathLength) +@inline(never) fileprivate func bjs_nodeBasename(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { + return bjs_nodeBasename_extern(pathWord0, pathWord1, pathWord2) } func _$nodeBasename(_ path: String) throws(JSException) -> String { - let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in - let ret = bjs_nodeBasename(pathBytes, pathLength) + let ret0 = path.bridgeJSWithLoweredParameter { (pathWord0, pathWord1, pathWord2) in + let ret = bjs_nodeBasename(pathWord0, pathWord1, pathWord2) return ret } let ret = ret0 @@ -64,19 +64,19 @@ func _$nodeBasename(_ path: String) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_nodeDirname") -fileprivate func bjs_nodeDirname_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 +fileprivate func bjs_nodeDirname_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 #else -fileprivate func bjs_nodeDirname_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { +fileprivate func bjs_nodeDirname_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_nodeDirname(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { - return bjs_nodeDirname_extern(pathBytes, pathLength) +@inline(never) fileprivate func bjs_nodeDirname(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { + return bjs_nodeDirname_extern(pathWord0, pathWord1, pathWord2) } func _$nodeDirname(_ path: String) throws(JSException) -> String { - let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in - let ret = bjs_nodeDirname(pathBytes, pathLength) + let ret0 = path.bridgeJSWithLoweredParameter { (pathWord0, pathWord1, pathWord2) in + let ret = bjs_nodeDirname(pathWord0, pathWord1, pathWord2) return ret } let ret = ret0 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift index 7780b5eb0..459130153 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSImportBareModuleFallback.swift @@ -40,20 +40,20 @@ func _$kebabCaseFunction() throws(JSException) -> Int { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_joinPaths") -fileprivate func bjs_joinPaths_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 +fileprivate func bjs_joinPaths_extern(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 #else -fileprivate func bjs_joinPaths_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 { +fileprivate func bjs_joinPaths_extern(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_joinPaths(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 { - return bjs_joinPaths_extern(lhsBytes, lhsLength, rhsBytes, rhsLength) +@inline(never) fileprivate func bjs_joinPaths(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 { + return bjs_joinPaths_extern(lhsWord0, lhsWord1, lhsWord2, rhsWord0, rhsWord1, rhsWord2) } func _$joinPaths(_ lhs: String, _ rhs: String) throws(JSException) -> String { - let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsBytes, lhsLength) in - let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsBytes, rhsLength) in - let ret = bjs_joinPaths(lhsBytes, lhsLength, rhsBytes, rhsLength) + let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsWord0, lhsWord1, lhsWord2) in + let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsWord0, rhsWord1, rhsWord2) in + let ret = bjs_joinPaths(lhsWord0, lhsWord1, lhsWord2, rhsWord0, rhsWord1, rhsWord2) return ret } return ret1 diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift index 8e01bca22..535c081f4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameOverride.swift @@ -59,7 +59,8 @@ public func _bjs_RenamedEnumMembers_static_defaultValue_get() -> Void { @_cdecl("bjs_RenamedEnumMembers_static_defaultValue_set") public func _bjs_RenamedEnumMembers_static_defaultValue_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - RenamedEnumMembers.defaultValue = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + RenamedEnumMembers.defaultValue = value #else fatalError("Only available on WebAssembly") #endif @@ -69,7 +70,9 @@ public func _bjs_RenamedEnumMembers_static_defaultValue_set(_ valueBytes: Int32, @_cdecl("bjs_RenamedNamespaceMembers_static_plus") public func _bjs_RenamedNamespaceMembers_static_plus(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = RenamedNamespaceMembers.add(_: Int.bridgeJSLiftParameter(a), _: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = RenamedNamespaceMembers.add(_: a, _: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -91,7 +94,8 @@ public func _bjs_RenamedNamespaceMembers_static_answer_get() -> Int32 { @_cdecl("bjs_RenamedNamespaceMembers_static_answer_set") public func _bjs_RenamedNamespaceMembers_static_answer_set(_ value: Int32) -> Void { #if arch(wasm32) - RenamedNamespaceMembers.answer = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + RenamedNamespaceMembers.answer = value #else fatalError("Only available on WebAssembly") #endif @@ -160,7 +164,8 @@ public func _bjs_RenamedVector_static_origin_get() -> Void { @_cdecl("bjs_RenamedVector_magnitude") public func _bjs_RenamedVector_magnitude() -> Float64 { #if arch(wasm32) - let ret = RenamedVector.bridgeJSLiftParameter().length() + let _self = RenamedVector.bridgeJSLiftParameter() + let ret = _self.length() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -171,7 +176,9 @@ public func _bjs_RenamedVector_magnitude() -> Float64 { @_cdecl("bjs_RenamedVector_static_fromPolar") public func _bjs_RenamedVector_static_fromPolar(_ radius: Float64, _ angle: Float64) -> Void { #if arch(wasm32) - let ret = RenamedVector.polar(radius: Double.bridgeJSLiftParameter(radius), angle: Double.bridgeJSLiftParameter(angle)) + let angle = Double.bridgeJSLiftParameter(angle) + let radius = Double.bridgeJSLiftParameter(radius) + let ret = RenamedVector.polar(radius: radius, angle: angle) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -182,7 +189,8 @@ public func _bjs_RenamedVector_static_fromPolar(_ radius: Float64, _ angle: Floa @_cdecl("bjs_makeGreeting") public func _bjs_makeGreeting(_ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = renderGreeting(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = renderGreeting(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -193,7 +201,8 @@ public func _bjs_makeGreeting(_ nameBytes: Int32, _ nameLength: Int32) -> Void { @_cdecl("bjs_greetName") public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = greet(_: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = greet(_: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -204,7 +213,8 @@ public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void { @_cdecl("bjs_greetCount") public func _bjs_greetCount(_ count: Int32) -> Void { #if arch(wasm32) - let ret = greet(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let ret = greet(_: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -226,7 +236,9 @@ public func _bjs_Utils_Text_namespacedRenamed() -> Int32 { @_cdecl("bjs_RenamedMembers_init") public func _bjs_RenamedMembers_init(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = RenamedMembers(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let ret = RenamedMembers(title: title, count: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -237,7 +249,8 @@ public func _bjs_RenamedMembers_init(_ titleBytes: Int32, _ titleLength: Int32, @_cdecl("bjs_RenamedMembers_makeGreeting") public func _bjs_RenamedMembers_makeGreeting(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = RenamedMembers.bridgeJSLiftParameter(_self).greet() + let _self = RenamedMembers.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -259,7 +272,8 @@ public func _bjs_RenamedMembers_static_makeDefault() -> UnsafeMutableRawPointer @_cdecl("bjs_RenamedMembers_title_get") public func _bjs_RenamedMembers_title_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = RenamedMembers.bridgeJSLiftParameter(_self).title + let _self = RenamedMembers.bridgeJSLiftParameter(_self) + let ret = _self.title return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -270,7 +284,9 @@ public func _bjs_RenamedMembers_title_get(_ _self: UnsafeMutableRawPointer) -> V @_cdecl("bjs_RenamedMembers_title_set") public func _bjs_RenamedMembers_title_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - RenamedMembers.bridgeJSLiftParameter(_self).title = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = RenamedMembers.bridgeJSLiftParameter(_self) + _self.title = value #else fatalError("Only available on WebAssembly") #endif @@ -280,7 +296,8 @@ public func _bjs_RenamedMembers_title_set(_ _self: UnsafeMutableRawPointer, _ va @_cdecl("bjs_RenamedMembers_count_get") public func _bjs_RenamedMembers_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = RenamedMembers.bridgeJSLiftParameter(_self).count + let _self = RenamedMembers.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -302,7 +319,8 @@ public func _bjs_RenamedMembers_static_sharedCount_get() -> Int32 { @_cdecl("bjs_RenamedMembers_static_sharedCount_set") public func _bjs_RenamedMembers_static_sharedCount_set(_ value: Int32) -> Void { #if arch(wasm32) - RenamedMembers.sharedCount = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + RenamedMembers.sharedCount = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.json new file mode 100644 index 000000000..9e3bc099c --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.json @@ -0,0 +1,115 @@ +{ + "exported" : { + "aliases" : [ + + ], + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_SwiftBox_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + + ] + }, + "isFinal" : true, + "jsName" : "PublicBox", + "methods" : [ + { + "abiName" : "bjs_SwiftBox_copy", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "copy", + "parameters" : [ + + ], + "returnType" : { + "swiftHeapObject" : { + "_0" : "SwiftBox" + } + } + } + ], + "name" : "SwiftBox", + "properties" : [ + + ], + "swiftCallName" : "SwiftBox" + } + ], + "enums" : [ + { + "cases" : [ + { + "associatedValues" : [ + + ], + "name" : "first" + }, + { + "associatedValues" : [ + + ], + "name" : "second" + } + ], + "emitStyle" : "const", + "jsName" : "PublicChoice", + "name" : "SwiftChoice", + "staticMethods" : [ + + ], + "staticProperties" : [ + + ], + "swiftCallName" : "SwiftChoice", + "tsFullPath" : "PublicChoice" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_renamedChoice", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "renamedChoice", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "caseEnum" : { + "_0" : "SwiftChoice" + } + } + } + ], + "returnType" : { + "caseEnum" : { + "_0" : "SwiftChoice" + } + } + } + ], + "protocols" : [ + + ], + "structs" : [ + + ] + }, + "moduleName" : "TestModule", + "usedExternalModules" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.swift new file mode 100644 index 000000000..ddcf5b98b --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSNameTypes.swift @@ -0,0 +1,124 @@ +extension SwiftChoice: _BridgedSwiftCaseEnum { + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> Int32 { + return bridgeJSRawValue + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftReturn(_ value: Int32) -> SwiftChoice { + return bridgeJSLiftParameter(value) + } + @_spi(BridgeJS) @_transparent public static func bridgeJSLiftParameter(_ value: Int32) -> SwiftChoice { + return SwiftChoice(bridgeJSRawValue: value)! + } + @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerReturn() -> Int32 { + return bridgeJSLowerParameter() + } + + @_spi(BridgeJS) @usableFromInline init?(bridgeJSRawValue: Int32) { + switch bridgeJSRawValue { + case 0: + self = .first + case 1: + self = .second + default: + return nil + } + } + + @_spi(BridgeJS) @usableFromInline var bridgeJSRawValue: Int32 { + switch self { + case .first: + return 0 + case .second: + return 1 + } + } +} + +@_expose(wasm, "bjs_renamedChoice") +@_cdecl("bjs_renamedChoice") +public func _bjs_renamedChoice(_ value: Int32) -> Int32 { + #if arch(wasm32) + let value = SwiftChoice.bridgeJSLiftParameter(value) + let ret = renamedChoice(_: value) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftBox_init") +@_cdecl("bjs_SwiftBox_init") +public func _bjs_SwiftBox_init() -> UnsafeMutableRawPointer { + #if arch(wasm32) + let ret = SwiftBox() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftBox_copy") +@_cdecl("bjs_SwiftBox_copy") +public func _bjs_SwiftBox_copy(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let _self = SwiftBox.bridgeJSLiftParameter(_self) + let ret = _self.copy() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftBox_deinit") +@_cdecl("bjs_SwiftBox_deinit") +public func _bjs_SwiftBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension SwiftBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_SwiftBox_wrap(Unmanaged.passRetained(self).toOpaque())))) + } + consuming func bridgeJSLowerAsProtocolReturn() -> Int32 { + _bjs_SwiftBox_wrap(Unmanaged.passRetained(self).toOpaque()) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_SwiftBox_wrap") +fileprivate func _bjs_SwiftBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_SwiftBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func _bjs_SwiftBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_SwiftBox_wrap_extern(pointer) +} + +extension SwiftBox: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = SwiftBox.bridgeJSMakeTypeHandle() +} + +extension SwiftChoice: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = SwiftChoice.bridgeJSMakeTypeHandle() +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles") +fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer?, _ count: Int32) + +@_expose(wasm, "bjs_TestModule_register_type_handles") +public func _bjs_TestModule_register_type_handles() { + let typeIds: [Int32] = [ + SwiftBox.bridgeJSTypeID, + SwiftChoice.bridgeJSTypeID, + ] + typeIds.withUnsafeBufferPointer { buffer in + _bjs_TestModule_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count)) + } +} +#endif \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.swift index 4777af058..1c619f690 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_processBytes") public func _bjs_processBytes(_ data: Int32) -> Int32 { #if arch(wasm32) - let ret = processBytes(_: JSUint8Array.bridgeJSLiftParameter(data)) + let data = JSUint8Array.bridgeJSLiftParameter(data) + let ret = processBytes(_: data) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_processBytes(_ data: Int32) -> Int32 { @_cdecl("bjs_processFloats") public func _bjs_processFloats(_ data: Int32) -> Int32 { #if arch(wasm32) - let ret = processFloats(_: JSFloat32Array.bridgeJSLiftParameter(data)) + let data = JSFloat32Array.bridgeJSLiftParameter(data) + let ret = processFloats(_: data) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_processFloats(_ data: Int32) -> Int32 { @_cdecl("bjs_processGenericDoubles") public func _bjs_processGenericDoubles(_ data: Int32) -> Int32 { #if arch(wasm32) - let ret = processGenericDoubles(_: JSFloat64Array.bridgeJSLiftParameter(data)) + let data = JSFloat64Array.bridgeJSLiftParameter(data) + let ret = processGenericDoubles(_: data) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,8 @@ public func _bjs_processGenericDoubles(_ data: Int32) -> Int32 { @_cdecl("bjs_processGenericInts") public func _bjs_processGenericInts(_ data: Int32) -> Int32 { #if arch(wasm32) - let ret = processGenericInts(_: JSInt32Array.bridgeJSLiftParameter(data)) + let data = JSInt32Array.bridgeJSLiftParameter(data) + let ret = processGenericInts(_: data) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift index 1ce288202..4d2f76b5b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSValue.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_roundTripJSValue") public func _bjs_roundTripJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripJSValue(_: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2)) + let value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let ret = roundTripJSValue(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_roundTripJSValue(_ valueKind: Int32, _ valuePayload1: Int32, _ @_cdecl("bjs_roundTripOptionalJSValue") public func _bjs_roundTripOptionalJSValue(_ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValue(_: Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2) + let ret = roundTripOptionalJSValue(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_roundTripOptionalJSValue(_ valueIsSome: Int32, _ valueKind: Int @_cdecl("bjs_roundTripJSValueArray") public func _bjs_roundTripJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripJSValueArray(_: [JSValue].bridgeJSStackPop()) + let values = [JSValue].bridgeJSStackPop() + let ret = roundTripJSValueArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,8 @@ public func _bjs_roundTripJSValueArray() -> Void { @_cdecl("bjs_roundTripOptionalJSValueArray") public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValueArray(_: Optional<[JSValue]>.bridgeJSLiftParameter()) + let values = Optional<[JSValue]>.bridgeJSLiftParameter() + let ret = roundTripOptionalJSValueArray(_: values) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -46,7 +50,9 @@ public func _bjs_roundTripOptionalJSValueArray() -> Void { @_cdecl("bjs_JSValueHolder_init") public func _bjs_JSValueHolder_init(_ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64, _ optionalValueIsSome: Int32, _ optionalValueKind: Int32, _ optionalValuePayload1: Int32, _ optionalValuePayload2: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = JSValueHolder(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2), optionalValue: Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2)) + let optionalValue = Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2) + let value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let ret = JSValueHolder(value: value, optionalValue: optionalValue) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -57,7 +63,10 @@ public func _bjs_JSValueHolder_init(_ valueKind: Int32, _ valuePayload1: Int32, @_cdecl("bjs_JSValueHolder_update") public func _bjs_JSValueHolder_update(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64, _ optionalValueIsSome: Int32, _ optionalValueKind: Int32, _ optionalValuePayload1: Int32, _ optionalValuePayload2: Float64) -> Void { #if arch(wasm32) - JSValueHolder.bridgeJSLiftParameter(_self).update(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2), optionalValue: Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2)) + let optionalValue = Optional.bridgeJSLiftParameter(optionalValueIsSome, optionalValueKind, optionalValuePayload1, optionalValuePayload2) + let value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + _self.update(value: value, optionalValue: optionalValue) #else fatalError("Only available on WebAssembly") #endif @@ -67,7 +76,9 @@ public func _bjs_JSValueHolder_update(_ _self: UnsafeMutableRawPointer, _ valueK @_cdecl("bjs_JSValueHolder_echo") public func _bjs_JSValueHolder_echo(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - let ret = JSValueHolder.bridgeJSLiftParameter(_self).echo(value: JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2)) + let value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + let ret = _self.echo(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -78,7 +89,9 @@ public func _bjs_JSValueHolder_echo(_ _self: UnsafeMutableRawPointer, _ valueKin @_cdecl("bjs_JSValueHolder_echoOptional") public func _bjs_JSValueHolder_echoOptional(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - let ret = JSValueHolder.bridgeJSLiftParameter(_self).echoOptional(_: Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2) + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + let ret = _self.echoOptional(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -89,7 +102,8 @@ public func _bjs_JSValueHolder_echoOptional(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_JSValueHolder_value_get") public func _bjs_JSValueHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = JSValueHolder.bridgeJSLiftParameter(_self).value + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -100,7 +114,9 @@ public func _bjs_JSValueHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Vo @_cdecl("bjs_JSValueHolder_value_set") public func _bjs_JSValueHolder_value_set(_ _self: UnsafeMutableRawPointer, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - JSValueHolder.bridgeJSLiftParameter(_self).value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let value = JSValue.bridgeJSLiftParameter(valueKind, valuePayload1, valuePayload2) + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -110,7 +126,8 @@ public func _bjs_JSValueHolder_value_set(_ _self: UnsafeMutableRawPointer, _ val @_cdecl("bjs_JSValueHolder_optionalValue_get") public func _bjs_JSValueHolder_optionalValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = JSValueHolder.bridgeJSLiftParameter(_self).optionalValue + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -121,7 +138,9 @@ public func _bjs_JSValueHolder_optionalValue_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_JSValueHolder_optionalValue_set") public func _bjs_JSValueHolder_optionalValue_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { #if arch(wasm32) - JSValueHolder.bridgeJSLiftParameter(_self).optionalValue = Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueKind, valuePayload1, valuePayload2) + let _self = JSValueHolder.bridgeJSLiftParameter(_self) + _self.optionalValue = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift index feaa7012c..ee9640144 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift @@ -24,7 +24,8 @@ public func _bjs_GlobalAPI_GlobalClass_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_GlobalAPI_GlobalClass_greet") public func _bjs_GlobalAPI_GlobalClass_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = GlobalClass.bridgeJSLiftParameter(_self).greet() + let _self = GlobalClass.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift index 184096f29..98cd730a5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift @@ -24,7 +24,8 @@ public func _bjs_PrivateAPI_PrivateClass_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_PrivateAPI_PrivateClass_greet") public func _bjs_PrivateAPI_PrivateClass_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PrivateClass.bridgeJSLiftParameter(_self).greet() + let _self = PrivateClass.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift index bff3007b7..dc4387ca3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NamespacedClassSignature.swift @@ -53,9 +53,10 @@ extension JSTypedClosure where Signature == (Workshop.Bench) -> Workshop.Bench { @_cdecl("invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC") public func _invoke_swift_closure_TestModule_10TestModule8Workshop5BenchC_8Workshop5BenchC(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) + let param0 = Workshop.Bench.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Workshop.Bench) -> Workshop.Bench>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Workshop.Bench.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -76,7 +77,9 @@ public func _bjs_makeBench() -> UnsafeMutableRawPointer { @_cdecl("bjs_refitBench") public func _bjs_refitBench(_ bench: UnsafeMutableRawPointer, _ transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = refitBench(_: Workshop.Bench.bridgeJSLiftParameter(bench), _: _BJS_Closure_10TestModule8Workshop5BenchC_8Workshop5BenchC.bridgeJSLift(transform)) + let transform = _BJS_Closure_10TestModule8Workshop5BenchC_8Workshop5BenchC.bridgeJSLift(transform) + let bench = Workshop.Bench.bridgeJSLiftParameter(bench) + let ret = refitBench(_: bench, _: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift index baa867eed..525a4e96d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift @@ -24,7 +24,8 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void { @_cdecl("bjs___Swift_Foundation_Greeter_init") public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +36,8 @@ public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLengt @_cdecl("bjs___Swift_Foundation_Greeter_greet") public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -110,7 +112,9 @@ public func _bjs_Utils_Converters_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Utils_Converters_Converter_toString") public func _bjs_Utils_Converters_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Converter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -152,7 +156,8 @@ fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMu @_cdecl("bjs___Swift_Foundation_UUID_uuidString") public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = UUID.bridgeJSLiftParameter(_self).uuidString() + let _self = UUID.bridgeJSLiftParameter(_self) + let ret = _self.uuidString() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -205,7 +210,8 @@ public func _bjs_Collections_Container_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Collections_Container_getItems") public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).getItems() + let _self = Container.bridgeJSLiftParameter(_self) + let ret = _self.getItems() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -216,7 +222,9 @@ public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_Collections_Container_addItem") public func _bjs_Collections_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).addItem(_: Greeter.bridgeJSLiftParameter(item)) + let item = Greeter.bridgeJSLiftParameter(item) + let _self = Container.bridgeJSLiftParameter(_self) + _self.addItem(_: item) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift index baa867eed..525a4e96d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift @@ -24,7 +24,8 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void { @_cdecl("bjs___Swift_Foundation_Greeter_init") public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +36,8 @@ public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLengt @_cdecl("bjs___Swift_Foundation_Greeter_greet") public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -110,7 +112,9 @@ public func _bjs_Utils_Converters_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Utils_Converters_Converter_toString") public func _bjs_Utils_Converters_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Converter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -152,7 +156,8 @@ fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMu @_cdecl("bjs___Swift_Foundation_UUID_uuidString") public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = UUID.bridgeJSLiftParameter(_self).uuidString() + let _self = UUID.bridgeJSLiftParameter(_self) + let ret = _self.uuidString() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -205,7 +210,8 @@ public func _bjs_Collections_Container_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Collections_Container_getItems") public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).getItems() + let _self = Container.bridgeJSLiftParameter(_self) + let ret = _self.getItems() ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -216,7 +222,9 @@ public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_Collections_Container_addItem") public func _bjs_Collections_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).addItem(_: Greeter.bridgeJSLiftParameter(item)) + let item = Greeter.bridgeJSLiftParameter(item) + let _self = Container.bridgeJSLiftParameter(_self) + _self.addItem(_: item) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift index 9e1b0e0f6..e7310b1dd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedType.swift @@ -98,7 +98,8 @@ fileprivate func _bjs_struct_lift_Player_Stats_extern() -> Int32 { @_cdecl("bjs_User_getName") public func _bjs_User_getName(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = User.bridgeJSLiftParameter(_self).getName() + let _self = User.bridgeJSLiftParameter(_self) + let ret = _self.getName() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -140,7 +141,8 @@ fileprivate func _bjs_User_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> In @_cdecl("bjs_Player_getTag") public func _bjs_Player_getTag(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Player.bridgeJSLiftParameter(_self).getTag() + let _self = Player.bridgeJSLiftParameter(_self) + let ret = _self.getTag() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift index 266f37f09..6da67b137 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/NestedTypeNameCollision.swift @@ -48,7 +48,8 @@ fileprivate func _bjs_struct_lift_Catalog_Entry_extern() -> Int32 { @_cdecl("bjs_Catalog_Entry_init") public func _bjs_Catalog_Entry_init(_ titleBytes: Int32, _ titleLength: Int32) -> Void { #if arch(wasm32) - let ret = Catalog.Entry(title: String.bridgeJSLiftParameter(titleBytes, titleLength)) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let ret = Catalog.Entry(title: title) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -105,7 +106,8 @@ fileprivate func _bjs_struct_lift_Entry_extern() -> Int32 { @_cdecl("bjs_Entry_init") public func _bjs_Entry_init(_ identifier: Int32) -> Void { #if arch(wasm32) - let ret = Entry(identifier: Int.bridgeJSLiftParameter(identifier)) + let identifier = Int.bridgeJSLiftParameter(identifier) + let ret = Entry(identifier: identifier) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -116,7 +118,8 @@ public func _bjs_Entry_init(_ identifier: Int32) -> Void { @_cdecl("bjs_takeEntry") public func _bjs_takeEntry() -> Void { #if arch(wasm32) - let ret = takeEntry(_: Entry.bridgeJSLiftParameter()) + let entry = Entry.bridgeJSLiftParameter() + let ret = takeEntry(_: entry) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -127,7 +130,8 @@ public func _bjs_takeEntry() -> Void { @_cdecl("bjs_takeCatalogEntry") public func _bjs_takeCatalogEntry() -> Void { #if arch(wasm32) - let ret = takeCatalogEntry(_: Catalog.Entry.bridgeJSLiftParameter()) + let entry = Catalog.Entry.bridgeJSLiftParameter() + let ret = takeCatalogEntry(_: entry) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift index f96fe39ff..c35ea24e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Optionals.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_roundTripOptionalClass") public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = roundTripOptionalClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripOptionalClass(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +14,8 @@ public func _bjs_roundTripOptionalClass(_ valueIsSome: Int32, _ valueValue: Unsa @_cdecl("bjs_testOptionalPropertyRoundtrip") public func _bjs_testOptionalPropertyRoundtrip(_ holderIsSome: Int32, _ holderValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = testOptionalPropertyRoundtrip(_: Optional.bridgeJSLiftParameter(holderIsSome, holderValue)) + let holder = Optional.bridgeJSLiftParameter(holderIsSome, holderValue) + let ret = testOptionalPropertyRoundtrip(_: holder) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +26,8 @@ public func _bjs_testOptionalPropertyRoundtrip(_ holderIsSome: Int32, _ holderVa @_cdecl("bjs_roundTripExportedOptionalJSObject") public func _bjs_roundTripExportedOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripExportedOptionalJSObject(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripExportedOptionalJSObject(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +38,8 @@ public func _bjs_roundTripExportedOptionalJSObject(_ valueIsSome: Int32, _ value @_cdecl("bjs_roundTripExportedOptionalJSClass") public func _bjs_roundTripExportedOptionalJSClass(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripExportedOptionalJSClass(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripExportedOptionalJSClass(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -46,7 +50,8 @@ public func _bjs_roundTripExportedOptionalJSClass(_ valueIsSome: Int32, _ valueV @_cdecl("bjs_roundTripString") public func _bjs_roundTripString(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripString(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripString(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -57,7 +62,8 @@ public func _bjs_roundTripString(_ nameIsSome: Int32, _ nameBytes: Int32, _ name @_cdecl("bjs_roundTripInt") public func _bjs_roundTripInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripInt(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripInt(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -68,7 +74,8 @@ public func _bjs_roundTripInt(_ valueIsSome: Int32, _ valueValue: Int32) -> Void @_cdecl("bjs_roundTripInt8") public func _bjs_roundTripInt8(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripInt8(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripInt8(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -79,7 +86,8 @@ public func _bjs_roundTripInt8(_ valueIsSome: Int32, _ valueValue: Int32) -> Voi @_cdecl("bjs_roundTripUInt8") public func _bjs_roundTripUInt8(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUInt8(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripUInt8(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -90,7 +98,8 @@ public func _bjs_roundTripUInt8(_ valueIsSome: Int32, _ valueValue: Int32) -> Vo @_cdecl("bjs_roundTripInt16") public func _bjs_roundTripInt16(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripInt16(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripInt16(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -101,7 +110,8 @@ public func _bjs_roundTripInt16(_ valueIsSome: Int32, _ valueValue: Int32) -> Vo @_cdecl("bjs_roundTripUInt16") public func _bjs_roundTripUInt16(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUInt16(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripUInt16(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -112,7 +122,8 @@ public func _bjs_roundTripUInt16(_ valueIsSome: Int32, _ valueValue: Int32) -> V @_cdecl("bjs_roundTripInt32") public func _bjs_roundTripInt32(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripInt32(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripInt32(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -123,7 +134,8 @@ public func _bjs_roundTripInt32(_ valueIsSome: Int32, _ valueValue: Int32) -> Vo @_cdecl("bjs_roundTripUInt32") public func _bjs_roundTripUInt32(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripUInt32(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripUInt32(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -134,7 +146,8 @@ public func _bjs_roundTripUInt32(_ valueIsSome: Int32, _ valueValue: Int32) -> V @_cdecl("bjs_roundTripBool") public func _bjs_roundTripBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripBool(flag: Optional.bridgeJSLiftParameter(flagIsSome, flagValue)) + let flag = Optional.bridgeJSLiftParameter(flagIsSome, flagValue) + let ret = roundTripBool(flag: flag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -145,7 +158,8 @@ public func _bjs_roundTripBool(_ flagIsSome: Int32, _ flagValue: Int32) -> Void @_cdecl("bjs_roundTripFloat") public func _bjs_roundTripFloat(_ numberIsSome: Int32, _ numberValue: Float32) -> Void { #if arch(wasm32) - let ret = roundTripFloat(number: Optional.bridgeJSLiftParameter(numberIsSome, numberValue)) + let number = Optional.bridgeJSLiftParameter(numberIsSome, numberValue) + let ret = roundTripFloat(number: number) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -156,7 +170,8 @@ public func _bjs_roundTripFloat(_ numberIsSome: Int32, _ numberValue: Float32) - @_cdecl("bjs_roundTripDouble") public func _bjs_roundTripDouble(_ precisionIsSome: Int32, _ precisionValue: Float64) -> Void { #if arch(wasm32) - let ret = roundTripDouble(precision: Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue)) + let precision = Optional.bridgeJSLiftParameter(precisionIsSome, precisionValue) + let ret = roundTripDouble(precision: precision) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -167,7 +182,8 @@ public func _bjs_roundTripDouble(_ precisionIsSome: Int32, _ precisionValue: Flo @_cdecl("bjs_roundTripSyntax") public func _bjs_roundTripSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripSyntax(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -178,7 +194,8 @@ public func _bjs_roundTripSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ name @_cdecl("bjs_roundTripMixSyntax") public func _bjs_roundTripMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripMixSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripMixSyntax(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -189,7 +206,8 @@ public func _bjs_roundTripMixSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ n @_cdecl("bjs_roundTripSwiftSyntax") public func _bjs_roundTripSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripSwiftSyntax(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -200,7 +218,8 @@ public func _bjs_roundTripSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ @_cdecl("bjs_roundTripMixedSwiftSyntax") public func _bjs_roundTripMixedSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripMixedSwiftSyntax(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripMixedSwiftSyntax(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -211,7 +230,8 @@ public func _bjs_roundTripMixedSwiftSyntax(_ nameIsSome: Int32, _ nameBytes: Int @_cdecl("bjs_roundTripWithSpaces") public func _bjs_roundTripWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) - let ret = roundTripWithSpaces(value: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = roundTripWithSpaces(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -222,7 +242,8 @@ public func _bjs_roundTripWithSpaces(_ valueIsSome: Int32, _ valueValue: Float64 @_cdecl("bjs_roundTripAlias") public func _bjs_roundTripAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripAlias(age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue)) + let age = Optional.bridgeJSLiftParameter(ageIsSome, ageValue) + let ret = roundTripAlias(age: age) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -233,7 +254,8 @@ public func _bjs_roundTripAlias(_ ageIsSome: Int32, _ ageValue: Int32) -> Void { @_cdecl("bjs_roundTripOptionalAlias") public func _bjs_roundTripOptionalAlias(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalAlias(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = roundTripOptionalAlias(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -244,7 +266,11 @@ public func _bjs_roundTripOptionalAlias(_ nameIsSome: Int32, _ nameBytes: Int32, @_cdecl("bjs_testMixedOptionals") public func _bjs_testMixedOptionals(_ firstNameIsSome: Int32, _ firstNameBytes: Int32, _ firstNameLength: Int32, _ lastNameIsSome: Int32, _ lastNameBytes: Int32, _ lastNameLength: Int32, _ ageIsSome: Int32, _ ageValue: Int32, _ active: Int32) -> Void { #if arch(wasm32) - let ret = testMixedOptionals(firstName: Optional.bridgeJSLiftParameter(firstNameIsSome, firstNameBytes, firstNameLength), lastName: Optional.bridgeJSLiftParameter(lastNameIsSome, lastNameBytes, lastNameLength), age: Optional.bridgeJSLiftParameter(ageIsSome, ageValue), active: Bool.bridgeJSLiftParameter(active)) + let active = Bool.bridgeJSLiftParameter(active) + let age = Optional.bridgeJSLiftParameter(ageIsSome, ageValue) + let lastName = Optional.bridgeJSLiftParameter(lastNameIsSome, lastNameBytes, lastNameLength) + let firstName = Optional.bridgeJSLiftParameter(firstNameIsSome, firstNameBytes, firstNameLength) + let ret = testMixedOptionals(firstName: firstName, lastName: lastName, age: age, active: active) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -255,7 +281,8 @@ public func _bjs_testMixedOptionals(_ firstNameIsSome: Int32, _ firstNameBytes: @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -266,7 +293,8 @@ public func _bjs_Greeter_init(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLen @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -277,7 +305,9 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_changeName") public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).changeName(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.changeName(name: name) #else fatalError("Only available on WebAssembly") #endif @@ -287,7 +317,8 @@ public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameIsSo @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).name + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -298,7 +329,9 @@ public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_set") public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).name = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -350,7 +383,8 @@ public func _bjs_OptionalPropertyHolder_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_OptionalPropertyHolder_optionalName_get") public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalName return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -361,7 +395,9 @@ public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableR @_cdecl("bjs_OptionalPropertyHolder_optionalName_set") public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalName = value #else fatalError("Only available on WebAssembly") #endif @@ -371,7 +407,8 @@ public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableR @_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalAge return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -382,7 +419,9 @@ public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalAge = value #else fatalError("Only available on WebAssembly") #endif @@ -392,7 +431,8 @@ public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalGreeter return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -403,7 +443,9 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutab @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalGreeter = value #else fatalError("Only available on WebAssembly") #endif @@ -442,14 +484,14 @@ fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutabl #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_init") -fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullBytes: Int32, _ valueOrNullLength: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedBytes: Int32, _ valueOrUndefinedLength: Int32) -> Int32 +fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullWord0: Int32, _ valueOrNullWord1: Int32, _ valueOrNullWord2: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedWord0: Int32, _ valueOrUndefinedWord1: Int32, _ valueOrUndefinedWord2: Int32) -> Int32 #else -fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullBytes: Int32, _ valueOrNullLength: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedBytes: Int32, _ valueOrUndefinedLength: Int32) -> Int32 { +fileprivate func bjs_WithOptionalJSClass_init_extern(_ valueOrNullIsSome: Int32, _ valueOrNullWord0: Int32, _ valueOrNullWord1: Int32, _ valueOrNullWord2: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedWord0: Int32, _ valueOrUndefinedWord1: Int32, _ valueOrUndefinedWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullBytes: Int32, _ valueOrNullLength: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedBytes: Int32, _ valueOrUndefinedLength: Int32) -> Int32 { - return bjs_WithOptionalJSClass_init_extern(valueOrNullIsSome, valueOrNullBytes, valueOrNullLength, valueOrUndefinedIsSome, valueOrUndefinedBytes, valueOrUndefinedLength) +@inline(never) fileprivate func bjs_WithOptionalJSClass_init(_ valueOrNullIsSome: Int32, _ valueOrNullWord0: Int32, _ valueOrNullWord1: Int32, _ valueOrNullWord2: Int32, _ valueOrUndefinedIsSome: Int32, _ valueOrUndefinedWord0: Int32, _ valueOrUndefinedWord1: Int32, _ valueOrUndefinedWord2: Int32) -> Int32 { + return bjs_WithOptionalJSClass_init_extern(valueOrNullIsSome, valueOrNullWord0, valueOrNullWord1, valueOrNullWord2, valueOrUndefinedIsSome, valueOrUndefinedWord0, valueOrUndefinedWord1, valueOrUndefinedWord2) } #if arch(wasm32) @@ -562,26 +604,26 @@ fileprivate func bjs_WithOptionalJSClass_childOrNull_get_extern(_ self: Int32) - #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrNull_set") -fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrNull_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WithOptionalJSClass_stringOrNull_set_extern(self, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrNull_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrNull_set_extern(self, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_stringOrUndefined_set") -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set_extern(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WithOptionalJSClass_stringOrUndefined_set_extern(self, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WithOptionalJSClass_stringOrUndefined_set(_ self: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WithOptionalJSClass_stringOrUndefined_set_extern(self, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -670,26 +712,26 @@ fileprivate func bjs_WithOptionalJSClass_childOrNull_set_extern(_ self: Int32, _ #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrNull") -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull_extern(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return bjs_WithOptionalJSClass_roundTripStringOrNull_extern(self, valueIsSome, valueBytes, valueLength) +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrNull(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripStringOrNull_extern(self, valueIsSome, valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_WithOptionalJSClass_roundTripStringOrUndefined") -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(self, valueIsSome, valueBytes, valueLength) +@inline(never) fileprivate func bjs_WithOptionalJSClass_roundTripStringOrUndefined(_ self: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return bjs_WithOptionalJSClass_roundTripStringOrUndefined_extern(self, valueIsSome, valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @@ -777,9 +819,9 @@ fileprivate func bjs_WithOptionalJSClass_roundTripChildOrNull_extern(_ self: Int } func _$WithOptionalJSClass_init(_ valueOrNull: Optional, _ valueOrUndefined: JSUndefinedOr) throws(JSException) -> JSObject { - let ret0 = valueOrNull.bridgeJSWithLoweredParameter { (valueOrNullIsSome, valueOrNullBytes, valueOrNullLength) in - let ret1 = valueOrUndefined.bridgeJSWithLoweredParameter { (valueOrUndefinedIsSome, valueOrUndefinedBytes, valueOrUndefinedLength) in - let ret = bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullBytes, valueOrNullLength, valueOrUndefinedIsSome, valueOrUndefinedBytes, valueOrUndefinedLength) + let ret0 = valueOrNull.bridgeJSWithLoweredParameter { (valueOrNullIsSome, valueOrNullWord0, valueOrNullWord1, valueOrNullWord2) in + let ret1 = valueOrUndefined.bridgeJSWithLoweredParameter { (valueOrUndefinedIsSome, valueOrUndefinedWord0, valueOrUndefinedWord1, valueOrUndefinedWord2) in + let ret = bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullWord0, valueOrNullWord1, valueOrNullWord2, valueOrUndefinedIsSome, valueOrUndefinedWord0, valueOrUndefinedWord1, valueOrUndefinedWord2) return ret } return ret1 @@ -873,9 +915,9 @@ func _$WithOptionalJSClass_childOrNull_get(_ self: JSObject) throws(JSException) } func _$WithOptionalJSClass_stringOrNull_set(_ self: JSObject, _ newValue: Optional) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WithOptionalJSClass_stringOrNull_set(selfValue, newValueIsSome, newValueBytes, newValueLength) + bjs_WithOptionalJSClass_stringOrNull_set(selfValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -883,9 +925,9 @@ func _$WithOptionalJSClass_stringOrNull_set(_ self: JSObject, _ newValue: Option } func _$WithOptionalJSClass_stringOrUndefined_set(_ self: JSObject, _ newValue: JSUndefinedOr) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WithOptionalJSClass_stringOrUndefined_set(selfValue, newValueIsSome, newValueBytes, newValueLength) + bjs_WithOptionalJSClass_stringOrUndefined_set(selfValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -956,9 +998,9 @@ func _$WithOptionalJSClass_childOrNull_set(_ self: JSObject, _ newValue: Optiona } func _$WithOptionalJSClass_roundTripStringOrNull(_ self: JSObject, _ value: Optional) throws(JSException) -> Optional { - value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WithOptionalJSClass_roundTripStringOrNull(selfValue, valueIsSome, valueBytes, valueLength) + bjs_WithOptionalJSClass_roundTripStringOrNull(selfValue, valueIsSome, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error @@ -967,9 +1009,9 @@ func _$WithOptionalJSClass_roundTripStringOrNull(_ self: JSObject, _ value: Opti } func _$WithOptionalJSClass_roundTripStringOrUndefined(_ self: JSObject, _ value: JSUndefinedOr) throws(JSException) -> JSUndefinedOr { - value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WithOptionalJSClass_roundTripStringOrUndefined(selfValue, valueIsSome, valueBytes, valueLength) + bjs_WithOptionalJSClass_roundTripStringOrUndefined(selfValue, valueIsSome, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift index e818f2877..f6c47ef5c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PrimitiveParameters.swift @@ -2,7 +2,12 @@ @_cdecl("bjs_check") public func _bjs_check(_ a: Int32, _ b: Int32, _ c: Float32, _ d: Float64, _ e: Int32) -> Void { #if arch(wasm32) - check(a: Int.bridgeJSLiftParameter(a), b: UInt.bridgeJSLiftParameter(b), c: Float.bridgeJSLiftParameter(c), d: Double.bridgeJSLiftParameter(d), e: Bool.bridgeJSLiftParameter(e)) + let e = Bool.bridgeJSLiftParameter(e) + let d = Double.bridgeJSLiftParameter(d) + let c = Float.bridgeJSLiftParameter(c) + let b = UInt.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + check(a: a, b: b, c: c, d: d, e: e) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift index 1c7c8350f..d5afd2def 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/PropertyTypes.swift @@ -2,7 +2,13 @@ @_cdecl("bjs_createPropertyHolder") public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) + let jsObject = JSObject.bridgeJSLiftParameter(jsObject) + let stringValue = String.bridgeJSLiftParameter(stringValueBytes, stringValueLength) + let boolValue = Bool.bridgeJSLiftParameter(boolValue) + let doubleValue = Double.bridgeJSLiftParameter(doubleValue) + let floatValue = Float.bridgeJSLiftParameter(floatValue) + let intValue = Int.bridgeJSLiftParameter(intValue) + let ret = createPropertyHolder(intValue: intValue, floatValue: floatValue, doubleValue: doubleValue, boolValue: boolValue, stringValue: stringValue, jsObject: jsObject) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13,7 +19,8 @@ public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, @_cdecl("bjs_testPropertyHolder") public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) + let holder = PropertyHolder.bridgeJSLiftParameter(holder) + let ret = testPropertyHolder(holder: holder) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -24,7 +31,13 @@ public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_PropertyHolder_init") public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) + let jsObject = JSObject.bridgeJSLiftParameter(jsObject) + let stringValue = String.bridgeJSLiftParameter(stringValueBytes, stringValueLength) + let boolValue = Bool.bridgeJSLiftParameter(boolValue) + let doubleValue = Double.bridgeJSLiftParameter(doubleValue) + let floatValue = Float.bridgeJSLiftParameter(floatValue) + let intValue = Int.bridgeJSLiftParameter(intValue) + let ret = PropertyHolder(intValue: intValue, floatValue: floatValue, doubleValue: doubleValue, boolValue: boolValue, stringValue: stringValue, jsObject: jsObject) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -35,7 +48,8 @@ public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ @_cdecl("bjs_PropertyHolder_getAllValues") public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues() + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.getAllValues() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -46,7 +60,8 @@ public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_intValue_get") public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.intValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -57,7 +72,9 @@ public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_intValue_set") public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.intValue = value #else fatalError("Only available on WebAssembly") #endif @@ -67,7 +84,8 @@ public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_floatValue_get") public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.floatValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -78,7 +96,9 @@ public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_floatValue_set") public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value) + let value = Float.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.floatValue = value #else fatalError("Only available on WebAssembly") #endif @@ -88,7 +108,8 @@ public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_doubleValue_get") public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.doubleValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -99,7 +120,9 @@ public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_doubleValue_set") public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.doubleValue = value #else fatalError("Only available on WebAssembly") #endif @@ -109,7 +132,8 @@ public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_boolValue_get") public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.boolValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -120,7 +144,9 @@ public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_boolValue_set") public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.boolValue = value #else fatalError("Only available on WebAssembly") #endif @@ -130,7 +156,8 @@ public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_stringValue_get") public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.stringValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -141,7 +168,9 @@ public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_stringValue_set") public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.stringValue = value #else fatalError("Only available on WebAssembly") #endif @@ -151,7 +180,8 @@ public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_readonlyInt_get") public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyInt return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -162,7 +192,8 @@ public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_readonlyFloat_get") public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyFloat return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -173,7 +204,8 @@ public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_PropertyHolder_readonlyDouble_get") public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyDouble return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -184,7 +216,8 @@ public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_PropertyHolder_readonlyBool_get") public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyBool return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -195,7 +228,8 @@ public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_PropertyHolder_readonlyString_get") public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyString return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -206,7 +240,8 @@ public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_PropertyHolder_jsObject_get") public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -217,7 +252,9 @@ public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_jsObject_set") public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value) + let value = JSObject.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.jsObject = value #else fatalError("Only available on WebAssembly") #endif @@ -227,7 +264,8 @@ public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_sibling_get") public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.sibling return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -238,7 +276,9 @@ public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_PropertyHolder_sibling_set") public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).sibling = PropertyHolder.bridgeJSLiftParameter(value) + let value = PropertyHolder.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.sibling = value #else fatalError("Only available on WebAssembly") #endif @@ -248,7 +288,8 @@ public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_lazyValue_get") public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.lazyValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -259,7 +300,9 @@ public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_lazyValue_set") public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.lazyValue = value #else fatalError("Only available on WebAssembly") #endif @@ -269,7 +312,8 @@ public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_computedReadonly_get") public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.computedReadonly return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -280,7 +324,8 @@ public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_PropertyHolder_computedReadWrite_get") public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.computedReadWrite return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -291,7 +336,9 @@ public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawP @_cdecl("bjs_PropertyHolder_computedReadWrite_set") public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.computedReadWrite = value #else fatalError("Only available on WebAssembly") #endif @@ -301,7 +348,8 @@ public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawP @_cdecl("bjs_PropertyHolder_observedProperty_get") public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.observedProperty return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -312,7 +360,9 @@ public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_PropertyHolder_observedProperty_set") public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.observedProperty = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json index bc443c6c0..40aa34cdf 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.json @@ -230,6 +230,79 @@ } } + }, + { + "abiName" : "bjs_MyViewController_validateValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validateValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_MyViewController_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyViewController_validatedDelegate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validatedDelegate", + "parameters" : [ + + ], + "returnType" : { + "swiftProtocol" : { + "_0" : "MyViewControllerDelegate" + } + } } ], "name" : "MyViewController", @@ -831,6 +904,99 @@ "_0" : "Result" } } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_MyViewControllerDelegate_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "MyViewControllerDelegate", diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift index 7c2db9a98..2f75db462 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Protocol.swift @@ -1,82 +1,360 @@ -struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModules7JSValueV_y") +fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModules7JSValueV_y(_ callback: Int32, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + return invoke_js_callback_TestModule_10TestModules7JSValueV_y_extern(callback, param0Kind, param0Payload1, param0Payload2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModules7JSValueV_y") +fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModules7JSValueV_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModules7JSValueV_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending JSValue) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let (param0Kind, param0Payload1, param0Payload2) = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModules7JSValueV_y(callbackValue, param0Kind, param0Payload1, param0Payload2) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending JSValue) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModules7JSValueV_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") +public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { + #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y") +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Word0, param0Word1, param0Word2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSS_y") +fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModulesSS_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModulesSS_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModulesSS_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending String) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Word0, param0Word1, param0Word2) + } + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending String) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModulesSS_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSS_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y") +public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { + #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSi_y") +fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSi_y(_ callback: Int32, _ param0: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSi_y_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModulesSi_y") +fileprivate func make_swift_closure_TestModule_10TestModulesSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModulesSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModulesSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModulesSi_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModulesSi_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending Int) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModulesSi_y(callbackValue, param0Value) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending Int) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Int) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_TestModule_10TestModulesSi_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModulesSi_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModulesSi_y") +public func _invoke_swift_closure_TestModule_10TestModulesSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { + #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuley_y") +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuley_y(_ callback: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuley_y_extern(callback) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuley_y") +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuley_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModuley_y { + static func bridgeJSLift(_ callbackId: Int32) -> () -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuley_y(callbackValue) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == () -> Void { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Void) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuley_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuley_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModuley_y") +public func _invoke_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure() + #else + fatalError("Only available on WebAssembly") + #endif +} +extension MyViewControllerDelegate where Self: _BridgedSwiftProtocolWrapper { func onSomethingHappened() -> Void { let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onSomethingHappened(jsObjectValue) + bjs_MyViewControllerDelegate_onSomethingHappened(jsObjectValue) } func onValueChanged(_ value: String) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onValueChanged(jsObjectValue, valueBytes, valueLength) + bjs_MyViewControllerDelegate_onValueChanged(jsObjectValue, valueWord0, valueWord1, valueWord2) } } func onCountUpdated(count: Int) -> Bool { let countValue = count.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_onCountUpdated(jsObjectValue, countValue) + let ret = bjs_MyViewControllerDelegate_onCountUpdated(jsObjectValue, countValue) return Bool.bridgeJSLiftReturn(ret) } func onLabelUpdated(_ prefix: String, _ suffix: String) -> Void { - prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in - suffix.bridgeJSWithLoweredParameter { (suffixBytes, suffixLength) in + prefix.bridgeJSWithLoweredParameter { (prefixWord0, prefixWord1, prefixWord2) in + suffix.bridgeJSWithLoweredParameter { (suffixWord0, suffixWord1, suffixWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onLabelUpdated(jsObjectValue, prefixBytes, prefixLength, suffixBytes, suffixLength) + bjs_MyViewControllerDelegate_onLabelUpdated(jsObjectValue, prefixWord0, prefixWord1, prefixWord2, suffixWord0, suffixWord1, suffixWord2) } } } func isCountEven() -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_isCountEven(jsObjectValue) + let ret = bjs_MyViewControllerDelegate_isCountEven(jsObjectValue) return Bool.bridgeJSLiftReturn(ret) } func onHelperUpdated(_ helper: Helper) -> Void { let helperPointer = helper.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onHelperUpdated(jsObjectValue, helperPointer) + bjs_MyViewControllerDelegate_onHelperUpdated(jsObjectValue, helperPointer) } func createHelper() -> Helper { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_createHelper(jsObjectValue) + let ret = bjs_MyViewControllerDelegate_createHelper(jsObjectValue) return Helper.bridgeJSLiftReturn(ret) } func onOptionalHelperUpdated(_ helper: Optional) -> Void { let (helperIsSome, helperPointer) = helper.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer) + bjs_MyViewControllerDelegate_onOptionalHelperUpdated(jsObjectValue, helperIsSome, helperPointer) } func createOptionalHelper() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_createOptionalHelper(jsObjectValue) + let ret = bjs_MyViewControllerDelegate_createOptionalHelper(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } func createEnum() -> ExampleEnum { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_createEnum(jsObjectValue) + let ret = bjs_MyViewControllerDelegate_createEnum(jsObjectValue) return ExampleEnum.bridgeJSLiftReturn(ret) } func handleResult(_ result: Result) -> Void { let resultCaseId = result.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_handleResult(jsObjectValue, resultCaseId) + bjs_MyViewControllerDelegate_handleResult(jsObjectValue, resultCaseId) } func getResult() -> Result { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_getResult(jsObjectValue) + let ret = bjs_MyViewControllerDelegate_getResult(jsObjectValue) return Result.bridgeJSLiftReturn(ret) } + func validate(_ value: Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_MyViewControllerDelegate_validate(jsObjectValue, valueValue) + if let error = _swift_js_take_exception() { throw error } + return Int.bridgeJSLiftReturn(ret) + } + + func loadLabel(_ key: String) async throws(JSException) -> String { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + key.bridgeJSWithLoweredParameter { (keyWord0, keyWord1, keyWord2) in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_loadLabel(resolveRef, rejectRef, jsObjectValue, keyWord0, keyWord1, keyWord2) + } + } + return resolved + } + + func reset() async throws(JSException) -> Void { + try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_reset(resolveRef, rejectRef, jsObjectValue) + } + } + + func fetchCount() async -> Int { + let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending Int) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_MyViewControllerDelegate_fetchCount(resolveRef, rejectRef, jsObjectValue) + } + return resolved + } + var eventCount: Int { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -105,9 +383,9 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Optional.bridgeJSLiftReturnFromSideChannel() } set { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - bjs_MyViewControllerDelegate_optionalName_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength) + bjs_MyViewControllerDelegate_optionalName_set(jsObjectValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } } } @@ -119,9 +397,9 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return Optional.bridgeJSLiftReturnFromSideChannel() } set { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - bjs_MyViewControllerDelegate_optionalRawEnum_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength) + bjs_MyViewControllerDelegate_optionalRawEnum_set(jsObjectValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } } } @@ -133,9 +411,9 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto return ExampleEnum.bridgeJSLiftReturn(ret) } set { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - bjs_MyViewControllerDelegate_rawStringEnum_set(jsObjectValue, newValueBytes, newValueLength) + bjs_MyViewControllerDelegate_rawStringEnum_set(jsObjectValue, newValueWord0, newValueWord1, newValueWord2) } } } @@ -217,6 +495,10 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto bjs_MyViewControllerDelegate_priorityOptional_set(jsObjectValue, newValueIsSome, newValueValue) } } +} + +struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyMyViewControllerDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -225,146 +507,194 @@ struct AnyMyViewControllerDelegate: MyViewControllerDelegate, _BridgedSwiftProto #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onSomethingHappened") -fileprivate func _extern_onSomethingHappened_extern(_ jsObject: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_onSomethingHappened_extern(_ jsObject: Int32) -> Void #else -fileprivate func _extern_onSomethingHappened_extern(_ jsObject: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_onSomethingHappened_extern(_ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onSomethingHappened(_ jsObject: Int32) -> Void { - return _extern_onSomethingHappened_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onSomethingHappened(_ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_onSomethingHappened_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onValueChanged") -fileprivate func _extern_onValueChanged_extern(_ jsObject: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_onValueChanged_extern(_ jsObject: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func _extern_onValueChanged_extern(_ jsObject: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_onValueChanged_extern(_ jsObject: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onValueChanged(_ jsObject: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return _extern_onValueChanged_extern(jsObject, valueBytes, valueLength) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onValueChanged(_ jsObject: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_onValueChanged_extern(jsObject, valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onCountUpdated") -fileprivate func _extern_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 #else -fileprivate func _extern_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_onCountUpdated_extern(_ jsObject: Int32, _ count: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 { - return _extern_onCountUpdated_extern(jsObject, count) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onCountUpdated(_ jsObject: Int32, _ count: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_onCountUpdated_extern(jsObject, count) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onLabelUpdated") -fileprivate func _extern_onLabelUpdated_extern(_ jsObject: Int32, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_onLabelUpdated_extern(_ jsObject: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32, _ suffixWord0: Int32, _ suffixWord1: Int32, _ suffixWord2: Int32) -> Void #else -fileprivate func _extern_onLabelUpdated_extern(_ jsObject: Int32, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_onLabelUpdated_extern(_ jsObject: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32, _ suffixWord0: Int32, _ suffixWord1: Int32, _ suffixWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onLabelUpdated(_ jsObject: Int32, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { - return _extern_onLabelUpdated_extern(jsObject, prefixBytes, prefixLength, suffixBytes, suffixLength) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onLabelUpdated(_ jsObject: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32, _ suffixWord0: Int32, _ suffixWord1: Int32, _ suffixWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_onLabelUpdated_extern(jsObject, prefixWord0, prefixWord1, prefixWord2, suffixWord0, suffixWord1, suffixWord2) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_isCountEven") -fileprivate func _extern_isCountEven_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_isCountEven_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_isCountEven_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_isCountEven_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_isCountEven(_ jsObject: Int32) -> Int32 { - return _extern_isCountEven_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_isCountEven(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_isCountEven_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onHelperUpdated") -fileprivate func _extern_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void +fileprivate func bjs_MyViewControllerDelegate_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void #else -fileprivate func _extern_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_MyViewControllerDelegate_onHelperUpdated_extern(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { - return _extern_onHelperUpdated_extern(jsObject, helper) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onHelperUpdated(_ jsObject: Int32, _ helper: UnsafeMutableRawPointer) -> Void { + return bjs_MyViewControllerDelegate_onHelperUpdated_extern(jsObject, helper) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createHelper") -fileprivate func _extern_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_MyViewControllerDelegate_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_MyViewControllerDelegate_createHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return _extern_createHelper_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_createHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_MyViewControllerDelegate_createHelper_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_onOptionalHelperUpdated") -fileprivate func _extern_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void +fileprivate func bjs_MyViewControllerDelegate_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void #else -fileprivate func _extern_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_MyViewControllerDelegate_onOptionalHelperUpdated_extern(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { - return _extern_onOptionalHelperUpdated_extern(jsObject, helperIsSome, helperPointer) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_onOptionalHelperUpdated(_ jsObject: Int32, _ helperIsSome: Int32, _ helperPointer: UnsafeMutableRawPointer) -> Void { + return bjs_MyViewControllerDelegate_onOptionalHelperUpdated_extern(jsObject, helperIsSome, helperPointer) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createOptionalHelper") -fileprivate func _extern_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_MyViewControllerDelegate_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_MyViewControllerDelegate_createOptionalHelper_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return _extern_createOptionalHelper_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_createOptionalHelper(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_MyViewControllerDelegate_createOptionalHelper_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_createEnum") -fileprivate func _extern_createEnum_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_createEnum_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_createEnum_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_createEnum_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_createEnum(_ jsObject: Int32) -> Int32 { - return _extern_createEnum_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_createEnum(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_createEnum_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_handleResult") -fileprivate func _extern_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void #else -fileprivate func _extern_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_handleResult_extern(_ jsObject: Int32, _ result: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_handleResult(_ jsObject: Int32, _ result: Int32) -> Void { - return _extern_handleResult_extern(jsObject, result) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_handleResult(_ jsObject: Int32, _ result: Int32) -> Void { + return bjs_MyViewControllerDelegate_handleResult_extern(jsObject, result) } #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_getResult") -fileprivate func _extern_getResult_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_MyViewControllerDelegate_getResult_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_MyViewControllerDelegate_getResult_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_getResult(_ jsObject: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_getResult_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_validate") +fileprivate func bjs_MyViewControllerDelegate_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 #else -fileprivate func _extern_getResult_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_MyViewControllerDelegate_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_getResult(_ jsObject: Int32) -> Int32 { - return _extern_getResult_extern(jsObject) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_validate(_ jsObject: Int32, _ value: Int32) -> Int32 { + return bjs_MyViewControllerDelegate_validate_extern(jsObject, value) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_loadLabel") +fileprivate func bjs_MyViewControllerDelegate_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_loadLabel(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_loadLabel_extern(resolveRef, rejectRef, jsObject, keyWord0, keyWord1, keyWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_reset") +fileprivate func bjs_MyViewControllerDelegate_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_reset(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_reset_extern(resolveRef, rejectRef, jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_fetchCount") +fileprivate func bjs_MyViewControllerDelegate_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_MyViewControllerDelegate_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_MyViewControllerDelegate_fetchCount(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_MyViewControllerDelegate_fetchCount_extern(resolveRef, rejectRef, jsObject) } #if arch(wasm32) @@ -417,14 +747,14 @@ fileprivate func bjs_MyViewControllerDelegate_optionalName_get_extern(_ jsObject #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalName_set") -fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalName_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_MyViewControllerDelegate_optionalName_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalName_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalName_set_extern(jsObject, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -441,14 +771,14 @@ fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_get_extern(_ jsObj #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_optionalRawEnum_set") -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_optionalRawEnum_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_optionalRawEnum_set_extern(jsObject, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -465,14 +795,14 @@ fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_get_extern(_ jsObjec #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_MyViewControllerDelegate_rawStringEnum_set") -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set_extern(_ jsObject: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_MyViewControllerDelegate_rawStringEnum_set_extern(jsObject, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_MyViewControllerDelegate_rawStringEnum_set(_ jsObject: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_MyViewControllerDelegate_rawStringEnum_set_extern(jsObject, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -696,9 +1026,10 @@ extension Priority: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum { @_cdecl("bjs_processDelegates") public func _bjs_processDelegates() -> Void { #if arch(wasm32) - let ret = processDelegates(_: [AnyMyViewControllerDelegate].bridgeJSStackPop()) + let delegates = [AnyMyViewControllerDelegate].bridgeJSStackPop() + let ret = processDelegates(_: delegates) for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_elem_ret, "MyViewControllerDelegate").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -710,10 +1041,11 @@ public func _bjs_processDelegates() -> Void { @_cdecl("bjs_processDelegatesByName") public func _bjs_processDelegatesByName() -> Void { #if arch(wasm32) - let ret = processDelegatesByName(_: [String: AnyMyViewControllerDelegate].bridgeJSLiftParameter()) + let delegates = [String: AnyMyViewControllerDelegate].bridgeJSLiftParameter() + let ret = processDelegatesByName(_: delegates) for __bjs_kv_ret in ret { __bjs_kv_ret.key.bridgeJSStackPush() - _swift_js_push_i32((__bjs_kv_ret.value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_kv_ret.value, "MyViewControllerDelegate").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -725,7 +1057,8 @@ public func _bjs_processDelegatesByName() -> Void { @_cdecl("bjs_Helper_init") public func _bjs_Helper_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Helper(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = Helper(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -736,7 +1069,8 @@ public func _bjs_Helper_init(_ value: Int32) -> UnsafeMutableRawPointer { @_cdecl("bjs_Helper_increment") public func _bjs_Helper_increment(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Helper.bridgeJSLiftParameter(_self).increment() + let _self = Helper.bridgeJSLiftParameter(_self) + _self.increment() #else fatalError("Only available on WebAssembly") #endif @@ -746,7 +1080,8 @@ public func _bjs_Helper_increment(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Helper_value_get") public func _bjs_Helper_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Helper.bridgeJSLiftParameter(_self).value + let _self = Helper.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -757,7 +1092,9 @@ public func _bjs_Helper_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { @_cdecl("bjs_Helper_value_set") public func _bjs_Helper_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - Helper.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = Helper.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -798,7 +1135,8 @@ fileprivate func _bjs_Helper_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> @_cdecl("bjs_MyViewController_init") public func _bjs_MyViewController_init(_ delegate: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = MyViewController(delegate: AnyMyViewControllerDelegate.bridgeJSLiftParameter(delegate)) + let delegate = AnyMyViewControllerDelegate.bridgeJSLiftParameter(delegate) + let ret = MyViewController(delegate: delegate) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -809,7 +1147,8 @@ public func _bjs_MyViewController_init(_ delegate: Int32) -> UnsafeMutableRawPoi @_cdecl("bjs_MyViewController_triggerEvent") public func _bjs_MyViewController_triggerEvent(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).triggerEvent() + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.triggerEvent() #else fatalError("Only available on WebAssembly") #endif @@ -819,7 +1158,9 @@ public func _bjs_MyViewController_triggerEvent(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_MyViewController_updateValue") public func _bjs_MyViewController_updateValue(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).updateValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.updateValue(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -829,7 +1170,9 @@ public func _bjs_MyViewController_updateValue(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_updateCount") public func _bjs_MyViewController_updateCount(_ _self: UnsafeMutableRawPointer, _ count: Int32) -> Int32 { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).updateCount(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let _self = MyViewController.bridgeJSLiftParameter(_self) + let ret = _self.updateCount(_: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -840,7 +1183,10 @@ public func _bjs_MyViewController_updateCount(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_updateLabel") public func _bjs_MyViewController_updateLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).updateLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let suffix = String.bridgeJSLiftParameter(suffixBytes, suffixLength) + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.updateLabel(_: prefix, _: suffix) #else fatalError("Only available on WebAssembly") #endif @@ -850,7 +1196,8 @@ public func _bjs_MyViewController_updateLabel(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_checkEvenCount") public func _bjs_MyViewController_checkEvenCount(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).checkEvenCount() + let _self = MyViewController.bridgeJSLiftParameter(_self) + let ret = _self.checkEvenCount() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -861,7 +1208,76 @@ public func _bjs_MyViewController_checkEvenCount(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_MyViewController_sendHelper") public func _bjs_MyViewController_sendHelper(_ _self: UnsafeMutableRawPointer, _ helper: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).sendHelper(_: Helper.bridgeJSLiftParameter(helper)) + let helper = Helper.bridgeJSLiftParameter(helper) + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.sendHelper(_: helper) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_validateValue") +@_cdecl("bjs_MyViewController_validateValue") +public func _bjs_MyViewController_validateValue(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = MyViewController.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validateValue(_: value) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_loadLabel") +@_cdecl("bjs_MyViewController_loadLabel") +public func _bjs_MyViewController_loadLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = MyViewController.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_MyViewController_validatedDelegate") +@_cdecl("bjs_MyViewController_validatedDelegate") +public func _bjs_MyViewController_validatedDelegate(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = MyViewController.bridgeJSLiftParameter(_self) + do { + let ret = _bridgeJSUnwrapProtocolExportable(try _self.validatedDelegate(), "MyViewControllerDelegate") + return ret.bridgeJSLowerAsProtocolReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } #else fatalError("Only available on WebAssembly") #endif @@ -871,7 +1287,8 @@ public func _bjs_MyViewController_sendHelper(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_MyViewController_delegate_get") public func _bjs_MyViewController_delegate_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).delegate as! _BridgedSwiftProtocolExportable + let _self = MyViewController.bridgeJSLiftParameter(_self) + let ret = _bridgeJSUnwrapProtocolExportable(_self.delegate, "MyViewControllerDelegate") return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") @@ -882,7 +1299,9 @@ public func _bjs_MyViewController_delegate_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_MyViewController_delegate_set") public func _bjs_MyViewController_delegate_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).delegate = AnyMyViewControllerDelegate.bridgeJSLiftParameter(value) + let value = AnyMyViewControllerDelegate.bridgeJSLiftParameter(value) + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.delegate = value #else fatalError("Only available on WebAssembly") #endif @@ -892,9 +1311,10 @@ public func _bjs_MyViewController_delegate_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_MyViewController_secondDelegate_get") public func _bjs_MyViewController_secondDelegate_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = MyViewController.bridgeJSLiftParameter(_self).secondDelegate + let _self = MyViewController.bridgeJSLiftParameter(_self) + let ret = _self.secondDelegate if let ret { - _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_return_optional_object(1, _bridgeJSUnwrapProtocolExportable(ret, "MyViewControllerDelegate").bridgeJSLowerAsProtocolReturn()) } else { _swift_js_return_optional_object(0, 0) } @@ -907,7 +1327,9 @@ public func _bjs_MyViewController_secondDelegate_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_MyViewController_secondDelegate_set") public func _bjs_MyViewController_secondDelegate_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - MyViewController.bridgeJSLiftParameter(_self).secondDelegate = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = MyViewController.bridgeJSLiftParameter(_self) + _self.secondDelegate = value #else fatalError("Only available on WebAssembly") #endif @@ -948,7 +1370,8 @@ fileprivate func _bjs_MyViewController_wrap_extern(_ pointer: UnsafeMutableRawPo @_cdecl("bjs_DelegateManager_init") public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DelegateManager(delegates: [AnyMyViewControllerDelegate].bridgeJSStackPop()) + let delegates = [AnyMyViewControllerDelegate].bridgeJSStackPop() + let ret = DelegateManager(delegates: delegates) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -959,7 +1382,8 @@ public func _bjs_DelegateManager_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_DelegateManager_notifyAll") public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DelegateManager.bridgeJSLiftParameter(_self).notifyAll() + let _self = DelegateManager.bridgeJSLiftParameter(_self) + _self.notifyAll() #else fatalError("Only available on WebAssembly") #endif @@ -969,9 +1393,10 @@ public func _bjs_DelegateManager_notifyAll(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_DelegateManager_delegates_get") public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DelegateManager.bridgeJSLiftParameter(_self).delegates + let _self = DelegateManager.bridgeJSLiftParameter(_self) + let ret = _self.delegates for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_elem_ret, "MyViewControllerDelegate").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -983,7 +1408,9 @@ public func _bjs_DelegateManager_delegates_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_delegates_set") public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DelegateManager.bridgeJSLiftParameter(_self).delegates = [AnyMyViewControllerDelegate].bridgeJSStackPop() + let value = [AnyMyViewControllerDelegate].bridgeJSStackPop() + let _self = DelegateManager.bridgeJSLiftParameter(_self) + _self.delegates = value #else fatalError("Only available on WebAssembly") #endif @@ -993,10 +1420,11 @@ public func _bjs_DelegateManager_delegates_set(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_DelegateManager_delegatesByName_get") public func _bjs_DelegateManager_delegatesByName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DelegateManager.bridgeJSLiftParameter(_self).delegatesByName + let _self = DelegateManager.bridgeJSLiftParameter(_self) + let ret = _self.delegatesByName for __bjs_kv_ret in ret { __bjs_kv_ret.key.bridgeJSStackPush() - _swift_js_push_i32((__bjs_kv_ret.value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_kv_ret.value, "MyViewControllerDelegate").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -1008,7 +1436,9 @@ public func _bjs_DelegateManager_delegatesByName_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_DelegateManager_delegatesByName_set") public func _bjs_DelegateManager_delegatesByName_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DelegateManager.bridgeJSLiftParameter(_self).delegatesByName = [String: AnyMyViewControllerDelegate].bridgeJSLiftParameter() + let value = [String: AnyMyViewControllerDelegate].bridgeJSLiftParameter() + let _self = DelegateManager.bridgeJSLiftParameter(_self) + _self.delegatesByName = value #else fatalError("Only available on WebAssembly") #endif @@ -1061,6 +1491,49 @@ extension Priority: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = Priority.bridgeJSMakeTypeHandle() } +@JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "promise_reject_TestModule") +fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void +#else +fileprivate func promise_reject_TestModule_extern(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func promise_reject_TestModule(_ promise: Int32, _ valueKind: Int32, _ valuePayload1: Int32, _ valuePayload2: Float64) -> Void { + return promise_reject_TestModule_extern(promise, valueKind, valuePayload1, valuePayload2) +} + +func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) -> Void { + let (valueKind, valuePayload1, valuePayload2) = value.bridgeJSLowerParameter() + let promiseValue = promise.bridgeJSLowerParameter() + promise_reject_TestModule(promiseValue, valueKind, valuePayload1, valuePayload2) + if let error = _swift_js_take_exception() { throw error } +} + +@JSFunction func Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS") +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void +#else +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_SS_extern(promise, valueWord0, valueWord1, valueWord2) +} + +func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in + let promiseValue = promise.bridgeJSLowerParameter() + promise_resolve_TestModule_SS(promiseValue, valueWord0, valueWord1, valueWord2) + } + if let error = _swift_js_take_exception() { throw error } +} + #if arch(wasm32) @_extern(wasm, module: "bjs", name: "bjs_TestModule_register_type_handles") fileprivate func _bjs_TestModule_register_type_handles_extern(_ base: UnsafePointer?, _ count: Int32) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift index d956a6f3a..bc63b1f65 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ProtocolInClosure.swift @@ -27,7 +27,7 @@ private enum _BJS_Closure_10TestModule10RenderableP_10RenderableP { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let param0ObjectId = _bridgeJSUnwrapProtocolExportable(param0, "Renderable").bridgeJSLowerAsProtocolReturn() let callbackValue = callback.bridgeJSLowerParameter() let ret = invoke_js_callback_TestModule_10TestModule10RenderableP_10RenderableP(callbackValue, param0ObjectId) return AnyRenderable.bridgeJSLiftReturn(ret) @@ -53,9 +53,10 @@ extension JSTypedClosure where Signature == (any Renderable) -> any Renderable { @_cdecl("invoke_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP") public func _invoke_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = AnyRenderable.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(any Renderable) -> any Renderable>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(AnyRenderable.bridgeJSLiftParameter(param0)) - return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let ret = _bridgeJSUnwrapProtocolExportable(closure(param0), "Renderable") + return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") #endif @@ -90,7 +91,7 @@ private enum _BJS_Closure_10TestModule10RenderableP_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let param0ObjectId = _bridgeJSUnwrapProtocolExportable(param0, "Renderable").bridgeJSLowerAsProtocolReturn() let callbackValue = callback.bridgeJSLowerParameter() let ret = invoke_js_callback_TestModule_10TestModule10RenderableP_SS(callbackValue, param0ObjectId) return String.bridgeJSLiftReturn(ret) @@ -116,9 +117,10 @@ extension JSTypedClosure where Signature == (any Renderable) -> String { @_cdecl("invoke_swift_closure_TestModule_10TestModule10RenderableP_SS") public func _invoke_swift_closure_TestModule_10TestModule10RenderableP_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = AnyRenderable.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(any Renderable) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(AnyRenderable.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -155,7 +157,7 @@ private enum _BJS_Closure_10TestModuleSq10RenderableP_SS { #if arch(wasm32) let (param0IsSome, param0ObjectId): (Int32, Int32) if let param0 { - (param0IsSome, param0ObjectId) = (1, (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + (param0IsSome, param0ObjectId) = (1, _bridgeJSUnwrapProtocolExportable(param0, "Renderable").bridgeJSLowerAsProtocolReturn()) } else { (param0IsSome, param0ObjectId) = (0, 0) } @@ -184,9 +186,10 @@ extension JSTypedClosure where Signature == (Optional) -> String @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq10RenderableP_SS") public func _invoke_swift_closure_TestModule_10TestModuleSq10RenderableP_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -247,21 +250,23 @@ extension JSTypedClosure where Signature == () -> any Renderable { public func _invoke_swift_closure_TestModule_10TestModuley_10RenderableP(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> any Renderable>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure() - return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let ret = _bridgeJSUnwrapProtocolExportable(closure(), "Renderable") + return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") #endif } -struct AnyRenderable: Renderable, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - +extension Renderable where Self: _BridgedSwiftProtocolWrapper { func render() -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_render(jsObjectValue) + let ret = bjs_Renderable_render(jsObjectValue) return String.bridgeJSLiftReturn(ret) } +} + +struct AnyRenderable: Renderable, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyRenderable(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -270,21 +275,23 @@ struct AnyRenderable: Renderable, _BridgedSwiftProtocolWrapper { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_Renderable_render") -fileprivate func _extern_render_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_Renderable_render_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_render_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_Renderable_render_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_render(_ jsObject: Int32) -> Int32 { - return _extern_render_extern(jsObject) +@inline(never) fileprivate func bjs_Renderable_render(_ jsObject: Int32) -> Int32 { + return bjs_Renderable_render_extern(jsObject) } @_expose(wasm, "bjs_processRenderable") @_cdecl("bjs_processRenderable") public func _bjs_processRenderable(_ item: Int32, _ transform: Int32) -> Void { #if arch(wasm32) - let ret = processRenderable(_: AnyRenderable.bridgeJSLiftParameter(item), transform: _BJS_Closure_10TestModule10RenderableP_SS.bridgeJSLift(transform)) + let transform = _BJS_Closure_10TestModule10RenderableP_SS.bridgeJSLift(transform) + let item = AnyRenderable.bridgeJSLiftParameter(item) + let ret = processRenderable(_: item, transform: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -295,7 +302,8 @@ public func _bjs_processRenderable(_ item: Int32, _ transform: Int32) -> Void { @_cdecl("bjs_makeRenderableFactory") public func _bjs_makeRenderableFactory(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> Int32 { #if arch(wasm32) - let ret = makeRenderableFactory(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) + let defaultName = String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength) + let ret = makeRenderableFactory(defaultName: defaultName) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -306,7 +314,8 @@ public func _bjs_makeRenderableFactory(_ defaultNameBytes: Int32, _ defaultNameL @_cdecl("bjs_roundtripRenderable") public func _bjs_roundtripRenderable(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripRenderable(_: _BJS_Closure_10TestModule10RenderableP_10RenderableP.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModule10RenderableP_10RenderableP.bridgeJSLift(callback) + let ret = roundtripRenderable(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -317,7 +326,8 @@ public func _bjs_roundtripRenderable(_ callback: Int32) -> Int32 { @_cdecl("bjs_processOptionalRenderable") public func _bjs_processOptionalRenderable(_ callback: Int32) -> Void { #if arch(wasm32) - let ret = processOptionalRenderable(_: _BJS_Closure_10TestModuleSq10RenderableP_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq10RenderableP_SS.bridgeJSLift(callback) + let ret = processOptionalRenderable(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -328,7 +338,8 @@ public func _bjs_processOptionalRenderable(_ callback: Int32) -> Void { @_cdecl("bjs_Widget_init") public func _bjs_Widget_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Widget(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Widget(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -339,7 +350,8 @@ public func _bjs_Widget_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeM @_cdecl("bjs_Widget_name_get") public func _bjs_Widget_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Widget.bridgeJSLiftParameter(_self).name + let _self = Widget.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -350,7 +362,9 @@ public func _bjs_Widget_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Widget_name_set") public func _bjs_Widget_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Widget.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Widget.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift index 0a6b272e9..52fa7a95d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/RelativeQualifiedTypes.swift @@ -92,7 +92,8 @@ fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 { @_cdecl("bjs_Library_Shelf_Divider_init") public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void { #if arch(wasm32) - let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot)) + let slot = Int.bridgeJSLiftParameter(slot) + let ret = Library.Shelf.Divider(slot: slot) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -158,7 +159,8 @@ public func _bjs_Outer_Inner_init() -> Void { @_cdecl("bjs_Outer_Inner_marker") public func _bjs_Outer_Inner_marker() -> Int32 { #if arch(wasm32) - let ret = Outer.Inner.bridgeJSLiftParameter().marker() + let _self = Outer.Inner.bridgeJSLiftParameter() + let ret = _self.marker() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -279,7 +281,9 @@ public func _bjs_Library_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Library_divider") public func _bjs_Library_divider(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).divider(_: Library.Shelf.Divider.bridgeJSLiftParameter()) + let value = Library.Shelf.Divider.bridgeJSLiftParameter() + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.divider(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json new file mode 100644 index 000000000..380de8738 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.json @@ -0,0 +1,459 @@ +{ + "exported" : { + "aliases" : [ + + ], + "classes" : [ + { + "constructor" : { + "abiName" : "bjs_ReservedWordBox_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + "methods" : [ + { + "abiName" : "bjs_ReservedWordBox_run", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "run", + "parameters" : [ + { + "label" : "for", + "name" : "for", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_ReservedWordBox_static_make", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "make", + "parameters" : [ + { + "label" : "default", + "name" : "default", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "staticContext" : { + "className" : { + "_0" : "ReservedWordBox" + } + } + } + ], + "name" : "ReservedWordBox", + "properties" : [ + + ], + "swiftCallName" : "ReservedWordBox" + } + ], + "enums" : [ + + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_check", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "check", + "parameters" : [ + { + "label" : "extension", + "name" : "extension", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "break", + "name" : "break", + "type" : { + "double" : { + + } + } + }, + { + "label" : "function", + "name" : "function", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "in", + "name" : "in", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkEscaped", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEscaped", + "parameters" : [ + { + "label" : "_", + "name" : "in", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkEscapedCollision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkEscapedCollision", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "_in", + "name" : "_in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_checkGlueNameCollision", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "checkGlueNameCollision", + "parameters" : [ + { + "label" : "instance", + "name" : "instance", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "swift", + "name" : "swift", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "protocols" : [ + { + "methods" : [ + { + "abiName" : "bjs_ReservedWordDelegate_handle", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handle", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "for", + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "label" : "_", + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "ReservedWordDelegate", + "properties" : [ + + ] + }, + { + "methods" : [ + { + "abiName" : "bjs_BacktickedLabelDelegate_handle", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "handle", + "parameters" : [ + { + "label" : "`in`", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "name" : "BacktickedLabelDelegate", + "properties" : [ + + ] + } + ], + "structs" : [ + + ] + }, + "imported" : { + "children" : [ + { + "functions" : [ + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "importedCheck", + "parameters" : [ + { + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "void" : { + + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "importedSelfClosure", + "parameters" : [ + { + "name" : "self", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "10TestModuley_y", + "moduleName" : "TestModule", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "void" : { + + } + } + } + ], + "types" : [ + + ] + } + ] + }, + "moduleName" : "TestModule", + "usedExternalModules" : [ + + ] +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift new file mode 100644 index 000000000..51b65629f --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/ReservedWordParameters.swift @@ -0,0 +1,280 @@ +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuley_y") +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_TestModule_10TestModuley_y_extern(_ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuley_y(_ callback: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuley_y_extern(callback) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_TestModule_10TestModuley_y") +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_TestModule_10TestModuley_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_TestModule_10TestModuley_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_10TestModuley_y { + static func bridgeJSLift(_ callbackId: Int32) -> () -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] in + #if arch(wasm32) + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_TestModule_10TestModuley_y(callbackValue) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == () -> Void { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping () -> Void) { + self.init( + makeClosure: make_swift_closure_TestModule_10TestModuley_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_TestModule_10TestModuley_y") +@_cdecl("invoke_swift_closure_TestModule_10TestModuley_y") +public func _invoke_swift_closure_TestModule_10TestModuley_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ReservedWordDelegate where Self: _BridgedSwiftProtocolWrapper { + func handle(`in`: Int, `for`: String, _ `default`: Bool) -> Void { + `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_ReservedWordDelegate_handle(jsObjectValue, inValue, forWord0, forWord1, forWord2, defaultValue) + } + } +} + +struct AnyReservedWordDelegate: ReservedWordDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyReservedWordDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ReservedWordDelegate_handle") +fileprivate func bjs_ReservedWordDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void +#else +fileprivate func bjs_ReservedWordDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ReservedWordDelegate_handle(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + return bjs_ReservedWordDelegate_handle_extern(jsObject, `in`, forWord0, forWord1, forWord2, `default`) +} + +extension BacktickedLabelDelegate where Self: _BridgedSwiftProtocolWrapper { + func handle(`in`: Int) -> Void { + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_BacktickedLabelDelegate_handle(jsObjectValue, inValue) + } +} + +struct AnyBacktickedLabelDelegate: BacktickedLabelDelegate, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyBacktickedLabelDelegate(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_BacktickedLabelDelegate_handle") +fileprivate func bjs_BacktickedLabelDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32) -> Void +#else +fileprivate func bjs_BacktickedLabelDelegate_handle_extern(_ jsObject: Int32, _ `in`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_BacktickedLabelDelegate_handle(_ jsObject: Int32, _ `in`: Int32) -> Void { + return bjs_BacktickedLabelDelegate_handle_extern(jsObject, `in`) +} + +@_expose(wasm, "bjs_check") +@_cdecl("bjs_check") +public func _bjs_check(_ `extension`: Int32, _ `break`: Float64, _ function: Int32, _ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let function = Bool.bridgeJSLiftParameter(function) + let `break` = Double.bridgeJSLiftParameter(`break`) + let `extension` = Int.bridgeJSLiftParameter(`extension`) + check(extension: `extension`, break: `break`, function: function, in: `in`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkEscaped") +@_cdecl("bjs_checkEscaped") +public func _bjs_checkEscaped(_ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + checkEscaped(_: `in`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkEscapedCollision") +@_cdecl("bjs_checkEscapedCollision") +public func _bjs_checkEscapedCollision(_ `in`: Int32, _ _in: Int32) -> Void { + #if arch(wasm32) + let _in = Int.bridgeJSLiftParameter(_in) + let `in` = Int.bridgeJSLiftParameter(`in`) + checkEscapedCollision(in: `in`, _in: _in) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_checkGlueNameCollision") +@_cdecl("bjs_checkGlueNameCollision") +public func _bjs_checkGlueNameCollision(_ instance: Int32, _ swiftBytes: Int32, _ swiftLength: Int32) -> Void { + #if arch(wasm32) + let swift = String.bridgeJSLiftParameter(swiftBytes, swiftLength) + let instance = Int.bridgeJSLiftParameter(instance) + checkGlueNameCollision(instance: instance, swift: swift) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_init") +@_cdecl("bjs_ReservedWordBox_init") +public func _bjs_ReservedWordBox_init(_ `in`: Int32) -> UnsafeMutableRawPointer { + #if arch(wasm32) + let `in` = Int.bridgeJSLiftParameter(`in`) + let ret = ReservedWordBox(in: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_run") +@_cdecl("bjs_ReservedWordBox_run") +public func _bjs_ReservedWordBox_run(_ _self: UnsafeMutableRawPointer, _ `for`: Int32) -> Void { + #if arch(wasm32) + let `for` = Int.bridgeJSLiftParameter(`for`) + let _self = ReservedWordBox.bridgeJSLiftParameter(_self) + _self.run(for: `for`) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_static_make") +@_cdecl("bjs_ReservedWordBox_static_make") +public func _bjs_ReservedWordBox_static_make(_ `default`: Int32) -> Int32 { + #if arch(wasm32) + let `default` = Int.bridgeJSLiftParameter(`default`) + let ret = ReservedWordBox.make(default: `default`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ReservedWordBox_deinit") +@_cdecl("bjs_ReservedWordBox_deinit") +public func _bjs_ReservedWordBox_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + Unmanaged.fromOpaque(pointer).release() + #else + fatalError("Only available on WebAssembly") + #endif +} + +extension ReservedWordBox: ConvertibleToJSValue, _BridgedSwiftHeapObject, _BridgedSwiftProtocolExportable { + var jsValue: JSValue { + return .object(JSObject(id: UInt32(bitPattern: _bjs_ReservedWordBox_wrap(Unmanaged.passRetained(self).toOpaque())))) + } + consuming func bridgeJSLowerAsProtocolReturn() -> Int32 { + _bjs_ReservedWordBox_wrap(Unmanaged.passRetained(self).toOpaque()) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_ReservedWordBox_wrap") +fileprivate func _bjs_ReservedWordBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 +#else +fileprivate func _bjs_ReservedWordBox_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func _bjs_ReservedWordBox_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 { + return _bjs_ReservedWordBox_wrap_extern(pointer) +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importedCheck") +fileprivate func bjs_importedCheck_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void +#else +fileprivate func bjs_importedCheck_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_importedCheck(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Void { + return bjs_importedCheck_extern(`in`, forWord0, forWord1, forWord2, `default`) +} + +func _$importedCheck(_ `in`: Int, _ `for`: String, _ `default`: Bool) throws(JSException) -> Void { + `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + bjs_importedCheck(inValue, forWord0, forWord1, forWord2, defaultValue) + } + if let error = _swift_js_take_exception() { + throw error + } +} + +#if arch(wasm32) +@_extern(wasm, module: "TestModule", name: "bjs_importedSelfClosure") +fileprivate func bjs_importedSelfClosure_extern(_ self: Int32) -> Void +#else +fileprivate func bjs_importedSelfClosure_extern(_ self: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_importedSelfClosure(_ self: Int32) -> Void { + return bjs_importedSelfClosure_extern(self) +} + +func _$importedSelfClosure(_ self: @escaping () -> Void) throws(JSException) -> Void { + let `self` = JSTypedClosure<() -> Void>(self) + let selfFuncRef = self.bridgeJSLowerParameter() + withExtendedLifetime((self)) { + bjs_importedSelfClosure(selfFuncRef) + } + if let error = _swift_js_take_exception() { + throw error + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift index 2d5a93c54..9bfff8ebb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.Global.swift @@ -37,7 +37,8 @@ extension Calculator: _BridgedSwiftCaseEnum { @_cdecl("bjs_Calculator_static_square") public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.square(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = Calculator.square(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -48,7 +49,8 @@ public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { @_cdecl("bjs_Calculator_static_cube") public func _bjs_Calculator_static_cube(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.cube(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = Calculator.cube(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -94,7 +96,8 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_APIResult_static_roundtrip") public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { #if arch(wasm32) - let ret = APIResult.roundtrip(value: APIResult.bridgeJSLiftParameter(value)) + let value = APIResult.bridgeJSLiftParameter(value) + let ret = APIResult.roundtrip(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -105,7 +108,8 @@ public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { @_cdecl("bjs_Utils_String_static_uppercase") public func _bjs_Utils_String_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = Utils.String.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let ret = Utils.String.uppercase(_: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -127,7 +131,9 @@ public func _bjs_MathUtils_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_MathUtils_static_subtract") public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.subtract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.subtract(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -138,7 +144,9 @@ public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { @_cdecl("bjs_MathUtils_static_add") public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -149,7 +157,10 @@ public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { @_cdecl("bjs_MathUtils_multiply") public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.bridgeJSLiftParameter(_self).multiply(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + let y = Int.bridgeJSLiftParameter(y) + let x = Int.bridgeJSLiftParameter(x) + let _self = MathUtils.bridgeJSLiftParameter(_self) + let ret = _self.multiply(x: x, y: y) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -160,7 +171,9 @@ public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32 @_cdecl("bjs_MathUtils_static_divide") public func _bjs_MathUtils_static_divide(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.divide(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.divide(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift index 2d5a93c54..9bfff8ebb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticFunctions.swift @@ -37,7 +37,8 @@ extension Calculator: _BridgedSwiftCaseEnum { @_cdecl("bjs_Calculator_static_square") public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.square(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = Calculator.square(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -48,7 +49,8 @@ public func _bjs_Calculator_static_square(_ value: Int32) -> Int32 { @_cdecl("bjs_Calculator_static_cube") public func _bjs_Calculator_static_cube(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.cube(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = Calculator.cube(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -94,7 +96,8 @@ extension APIResult: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_APIResult_static_roundtrip") public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { #if arch(wasm32) - let ret = APIResult.roundtrip(value: APIResult.bridgeJSLiftParameter(value)) + let value = APIResult.bridgeJSLiftParameter(value) + let ret = APIResult.roundtrip(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -105,7 +108,8 @@ public func _bjs_APIResult_static_roundtrip(_ value: Int32) -> Void { @_cdecl("bjs_Utils_String_static_uppercase") public func _bjs_Utils_String_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = Utils.String.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let ret = Utils.String.uppercase(_: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -127,7 +131,9 @@ public func _bjs_MathUtils_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_MathUtils_static_subtract") public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.subtract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.subtract(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -138,7 +144,9 @@ public func _bjs_MathUtils_static_subtract(_ a: Int32, _ b: Int32) -> Int32 { @_cdecl("bjs_MathUtils_static_add") public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -149,7 +157,10 @@ public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { @_cdecl("bjs_MathUtils_multiply") public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.bridgeJSLiftParameter(_self).multiply(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + let y = Int.bridgeJSLiftParameter(y) + let x = Int.bridgeJSLiftParameter(x) + let _self = MathUtils.bridgeJSLiftParameter(_self) + let ret = _self.multiply(x: x, y: y) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -160,7 +171,9 @@ public func _bjs_MathUtils_multiply(_ _self: UnsafeMutableRawPointer, _ x: Int32 @_cdecl("bjs_MathUtils_static_divide") public func _bjs_MathUtils_static_divide(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.divide(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.divide(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift index 721c5335a..00e6999c5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.Global.swift @@ -48,7 +48,8 @@ public func _bjs_PropertyEnum_static_enumProperty_get() -> Void { @_cdecl("bjs_PropertyEnum_static_enumProperty_set") public func _bjs_PropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyEnum.enumProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -80,7 +81,8 @@ public func _bjs_PropertyEnum_static_computedEnum_get() -> Void { @_cdecl("bjs_PropertyEnum_static_computedEnum_set") public func _bjs_PropertyEnum_static_computedEnum_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyEnum.computedEnum = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyEnum.computedEnum = value #else fatalError("Only available on WebAssembly") #endif @@ -101,7 +103,8 @@ public func _bjs_PropertyNamespace_static_namespaceProperty_get() -> Void { @_cdecl("bjs_PropertyNamespace_static_namespaceProperty_set") public func _bjs_PropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyNamespace.namespaceProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -133,7 +136,8 @@ public func _bjs_PropertyNamespace_Nested_static_nestedProperty_get() -> Int32 { @_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_set") public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyNamespace.Nested.nestedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + PropertyNamespace.Nested.nestedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -165,7 +169,8 @@ public func _bjs_PropertyNamespace_Nested_static_nestedDouble_get() -> Float64 { @_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_set") public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) - PropertyNamespace.Nested.nestedDouble = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + PropertyNamespace.Nested.nestedDouble = value #else fatalError("Only available on WebAssembly") #endif @@ -208,7 +213,8 @@ public func _bjs_PropertyClass_static_staticVariable_get() -> Int32 { @_cdecl("bjs_PropertyClass_static_staticVariable_set") public func _bjs_PropertyClass_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyClass.staticVariable = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + PropertyClass.staticVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -229,7 +235,8 @@ public func _bjs_PropertyClass_static_jsObjectProperty_get() -> Int32 { @_cdecl("bjs_PropertyClass_static_jsObjectProperty_set") public func _bjs_PropertyClass_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyClass.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) + let value = JSObject.bridgeJSLiftParameter(value) + PropertyClass.jsObjectProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -250,7 +257,8 @@ public func _bjs_PropertyClass_static_classVariable_get() -> Void { @_cdecl("bjs_PropertyClass_static_classVariable_set") public func _bjs_PropertyClass_static_classVariable_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.classVariable = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyClass.classVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -271,7 +279,8 @@ public func _bjs_PropertyClass_static_computedProperty_get() -> Void { @_cdecl("bjs_PropertyClass_static_computedProperty_set") public func _bjs_PropertyClass_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyClass.computedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -303,7 +312,8 @@ public func _bjs_PropertyClass_static_optionalProperty_get() -> Void { @_cdecl("bjs_PropertyClass_static_optionalProperty_set") public func _bjs_PropertyClass_static_optionalProperty_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.optionalProperty = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + PropertyClass.optionalProperty = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift index 721c5335a..00e6999c5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StaticProperties.swift @@ -48,7 +48,8 @@ public func _bjs_PropertyEnum_static_enumProperty_get() -> Void { @_cdecl("bjs_PropertyEnum_static_enumProperty_set") public func _bjs_PropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyEnum.enumProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -80,7 +81,8 @@ public func _bjs_PropertyEnum_static_computedEnum_get() -> Void { @_cdecl("bjs_PropertyEnum_static_computedEnum_set") public func _bjs_PropertyEnum_static_computedEnum_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyEnum.computedEnum = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyEnum.computedEnum = value #else fatalError("Only available on WebAssembly") #endif @@ -101,7 +103,8 @@ public func _bjs_PropertyNamespace_static_namespaceProperty_get() -> Void { @_cdecl("bjs_PropertyNamespace_static_namespaceProperty_set") public func _bjs_PropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyNamespace.namespaceProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -133,7 +136,8 @@ public func _bjs_PropertyNamespace_Nested_static_nestedProperty_get() -> Int32 { @_cdecl("bjs_PropertyNamespace_Nested_static_nestedProperty_set") public func _bjs_PropertyNamespace_Nested_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyNamespace.Nested.nestedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + PropertyNamespace.Nested.nestedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -165,7 +169,8 @@ public func _bjs_PropertyNamespace_Nested_static_nestedDouble_get() -> Float64 { @_cdecl("bjs_PropertyNamespace_Nested_static_nestedDouble_set") public func _bjs_PropertyNamespace_Nested_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) - PropertyNamespace.Nested.nestedDouble = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + PropertyNamespace.Nested.nestedDouble = value #else fatalError("Only available on WebAssembly") #endif @@ -208,7 +213,8 @@ public func _bjs_PropertyClass_static_staticVariable_get() -> Int32 { @_cdecl("bjs_PropertyClass_static_staticVariable_set") public func _bjs_PropertyClass_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyClass.staticVariable = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + PropertyClass.staticVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -229,7 +235,8 @@ public func _bjs_PropertyClass_static_jsObjectProperty_get() -> Int32 { @_cdecl("bjs_PropertyClass_static_jsObjectProperty_set") public func _bjs_PropertyClass_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - PropertyClass.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) + let value = JSObject.bridgeJSLiftParameter(value) + PropertyClass.jsObjectProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -250,7 +257,8 @@ public func _bjs_PropertyClass_static_classVariable_get() -> Void { @_cdecl("bjs_PropertyClass_static_classVariable_set") public func _bjs_PropertyClass_static_classVariable_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.classVariable = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyClass.classVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -271,7 +279,8 @@ public func _bjs_PropertyClass_static_computedProperty_get() -> Void { @_cdecl("bjs_PropertyClass_static_computedProperty_set") public func _bjs_PropertyClass_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + PropertyClass.computedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -303,7 +312,8 @@ public func _bjs_PropertyClass_static_optionalProperty_get() -> Void { @_cdecl("bjs_PropertyClass_static_optionalProperty_set") public func _bjs_PropertyClass_static_optionalProperty_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyClass.optionalProperty = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + PropertyClass.optionalProperty = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift index 0760df764..f00cbd49c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StringParameter.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_checkString") public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) - checkString(a: String.bridgeJSLiftParameter(aBytes, aLength)) + let a = String.bridgeJSLiftParameter(aBytes, aLength) + checkString(a: a) #else fatalError("Only available on WebAssembly") #endif @@ -12,7 +13,8 @@ public func _bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { @_cdecl("bjs_roundtripString") public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) - let ret = roundtripString(a: String.bridgeJSLiftParameter(aBytes, aLength)) + let a = String.bridgeJSLiftParameter(aBytes, aLength) + let ret = roundtripString(a: a) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -21,19 +23,19 @@ public func _bjs_roundtripString(_ aBytes: Int32, _ aLength: Int32) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkString") -fileprivate func bjs_checkString_extern(_ aBytes: Int32, _ aLength: Int32) -> Void +fileprivate func bjs_checkString_extern(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32) -> Void #else -fileprivate func bjs_checkString_extern(_ aBytes: Int32, _ aLength: Int32) -> Void { +fileprivate func bjs_checkString_extern(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_checkString(_ aBytes: Int32, _ aLength: Int32) -> Void { - return bjs_checkString_extern(aBytes, aLength) +@inline(never) fileprivate func bjs_checkString(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32) -> Void { + return bjs_checkString_extern(aWord0, aWord1, aWord2) } func _$checkString(_ a: String) throws(JSException) -> Void { - a.bridgeJSWithLoweredParameter { (aBytes, aLength) in - bjs_checkString(aBytes, aLength) + a.bridgeJSWithLoweredParameter { (aWord0, aWord1, aWord2) in + bjs_checkString(aWord0, aWord1, aWord2) } if let error = _swift_js_take_exception() { throw error @@ -42,20 +44,20 @@ func _$checkString(_ a: String) throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "TestModule", name: "bjs_checkStringWithLength") -fileprivate func bjs_checkStringWithLength_extern(_ aBytes: Int32, _ aLength: Int32, _ b: Float64) -> Void +fileprivate func bjs_checkStringWithLength_extern(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32, _ b: Float64) -> Void #else -fileprivate func bjs_checkStringWithLength_extern(_ aBytes: Int32, _ aLength: Int32, _ b: Float64) -> Void { +fileprivate func bjs_checkStringWithLength_extern(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32, _ b: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_checkStringWithLength(_ aBytes: Int32, _ aLength: Int32, _ b: Float64) -> Void { - return bjs_checkStringWithLength_extern(aBytes, aLength, b) +@inline(never) fileprivate func bjs_checkStringWithLength(_ aWord0: Int32, _ aWord1: Int32, _ aWord2: Int32, _ b: Float64) -> Void { + return bjs_checkStringWithLength_extern(aWord0, aWord1, aWord2, b) } func _$checkStringWithLength(_ a: String, _ b: Double) throws(JSException) -> Void { - a.bridgeJSWithLoweredParameter { (aBytes, aLength) in + a.bridgeJSWithLoweredParameter { (aWord0, aWord1, aWord2) in let bValue = b.bridgeJSLowerParameter() - bjs_checkStringWithLength(aBytes, aLength, bValue) + bjs_checkStringWithLength(aWord0, aWord1, aWord2, bValue) } if let error = _swift_js_take_exception() { throw error diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift index 8fc6db1a7..1db3c9e5e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/StructWithNestedTypes.swift @@ -57,7 +57,8 @@ fileprivate func _bjs_struct_lift_Shape_extern() -> Int32 { @_cdecl("bjs_Shape_init") public func _bjs_Shape_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Shape(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Shape(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -114,7 +115,8 @@ fileprivate func _bjs_struct_lift_Widget_extern() -> Int32 { @_cdecl("bjs_Widget_init") public func _bjs_Widget_init(_ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = Widget(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Widget(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -219,7 +221,9 @@ fileprivate func _bjs_struct_lift_Widget_Bounds_extern() -> Int32 { @_cdecl("bjs_Widget_Bounds_init") public func _bjs_Widget_Bounds_init(_ width: Int32, _ height: Int32) -> Void { #if arch(wasm32) - let ret = Widget.Bounds(width: Int.bridgeJSLiftParameter(width), height: Int.bridgeJSLiftParameter(height)) + let height = Int.bridgeJSLiftParameter(height) + let width = Int.bridgeJSLiftParameter(width) + let ret = Widget.Bounds(width: width, height: height) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift index abf33ec5e..634333863 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClass.swift @@ -2,7 +2,8 @@ @_cdecl("bjs_takeGreeter") public func _bjs_takeGreeter(_ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeGreeter(greeter: Greeter.bridgeJSLiftParameter(greeter)) + let greeter = Greeter.bridgeJSLiftParameter(greeter) + takeGreeter(greeter: greeter) #else fatalError("Only available on WebAssembly") #endif @@ -12,7 +13,8 @@ public func _bjs_takeGreeter(_ greeter: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -23,7 +25,8 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -34,7 +37,9 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_changeName") public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.changeName(name: name) #else fatalError("Only available on WebAssembly") #endif @@ -44,7 +49,8 @@ public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameByte @_cdecl("bjs_Greeter_greetEnthusiastically") public func _bjs_Greeter_greetEnthusiastically(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greetEnthusiastically() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greetEnthusiastically() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -66,7 +72,8 @@ public func _bjs_Greeter_static_greetAnonymously() -> Void { @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).name + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -77,7 +84,9 @@ public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_set") public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -87,7 +96,8 @@ public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes @_cdecl("bjs_Greeter_nameCount_get") public func _bjs_Greeter_nameCount_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).nameCount + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.nameCount return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift index c2844aa9c..152b41102 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosure.swift @@ -53,9 +53,10 @@ extension JSTypedClosure where Signature == (HttpStatus) -> HttpStatus { @_cdecl("invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO") public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = HttpStatus.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> HttpStatus>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(HttpStatus.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -63,14 +64,14 @@ public func _invoke_swift_closure_TestModule_10TestModule10HttpStatusO_10HttpSta #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO") -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -90,9 +91,9 @@ private enum _BJS_Closure_10TestModule5ThemeO_5ThemeO { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -119,9 +120,10 @@ extension JSTypedClosure where Signature == (Theme) -> Theme { @_cdecl("invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO") public func _invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Theme.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Theme>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -182,9 +184,10 @@ extension JSTypedClosure where Signature == (Animal) -> Animal { @_cdecl("invoke_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV") public func _invoke_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Animal.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(Animal) -> Animal>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Animal.bridgeJSLiftParameter()) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -245,9 +248,10 @@ extension JSTypedClosure where Signature == (Person) -> Person { @_cdecl("invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC") public func _invoke_swift_closure_TestModule_10TestModule6PersonC_6PersonC(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) + let param0 = Person.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Person) -> Person>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Person.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -308,9 +312,10 @@ extension JSTypedClosure where Signature == (APIResult) -> APIResult { @_cdecl("invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO") public func _invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = APIResult.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> APIResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(APIResult.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -371,9 +376,10 @@ extension JSTypedClosure where Signature == (Direction) -> Direction { @_cdecl("invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO") public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Direction.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Direction>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Direction.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -381,14 +387,14 @@ public func _invoke_swift_closure_TestModule_10TestModule9DirectionO_9DirectionO #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -408,9 +414,9 @@ private enum _BJS_Closure_10TestModuleKSS_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] (param0: String) throws(JSException) -> Bool in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -440,10 +446,11 @@ extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool @_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Sb") public func _invoke_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure do { - let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = try closure(param0) + return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -464,14 +471,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: Unsafe #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Si") -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Si(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleKSS_Si_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -491,9 +498,9 @@ private enum _BJS_Closure_10TestModuleKSS_Si { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] (param0: String) throws(JSException) -> Int in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleKSS_Si(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_TestModule_10TestModuleKSS_Si(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -523,10 +530,11 @@ extension JSTypedClosure where Signature == (String) throws(JSException) -> Int @_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Si") public func _invoke_swift_closure_TestModule_10TestModuleKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure do { - let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = try closure(param0) + return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -547,14 +555,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleKSS_Si(_ boxPtr: Unsafe #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_TestModule_10TestModuleSS_SS_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSS_SS(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleSS_SS_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -574,9 +582,9 @@ private enum _BJS_Closure_10TestModuleSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_TestModule_10TestModuleSS_SS(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -603,9 +611,10 @@ extension JSTypedClosure where Signature == (String) -> String { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSS_SS") public func _invoke_swift_closure_TestModule_10TestModuleSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -666,9 +675,10 @@ extension JSTypedClosure where Signature == (Bool) -> Bool { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSb_Sb") public func _invoke_swift_closure_TestModule_10TestModuleSb_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Bool.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Bool.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -729,9 +739,10 @@ extension JSTypedClosure where Signature == (Double) -> Double { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSd_Sd") public func _invoke_swift_closure_TestModule_10TestModuleSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Float64 { #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Double>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Double.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -792,9 +803,10 @@ extension JSTypedClosure where Signature == (Float) -> Float { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSf_Sf") public func _invoke_swift_closure_TestModule_10TestModuleSf_Sf(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float32) -> Float32 { #if arch(wasm32) + let param0 = Float.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Float) -> Float>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Float.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -855,9 +867,10 @@ extension JSTypedClosure where Signature == (Int) -> Int { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSi_Si") public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -918,9 +931,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -928,14 +942,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10Htt #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(callback, param0IsSome, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO_extern(callback, param0IsSome, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -955,9 +969,9 @@ private enum _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(callbackValue, param0IsSome, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(callbackValue, param0IsSome, param0Word0, param0Word1, param0Word2) } return Optional.bridgeJSLiftReturnFromSideChannel() #else @@ -982,9 +996,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional @_cdecl("invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO") public func _invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1045,9 +1060,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter()) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1108,9 +1124,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1171,9 +1188,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1234,9 +1252,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1244,14 +1263,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9Direct #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleSqSS_SqSS") -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(callback, param0IsSome, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleSqSS_SqSS_extern(callback, param0IsSome, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1271,9 +1290,9 @@ private enum _BJS_Closure_10TestModuleSqSS_SqSS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(callbackValue, param0IsSome, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleSqSS_SqSS(callbackValue, param0IsSome, param0Word0, param0Word1, param0Word2) } return Optional.bridgeJSLiftReturnFromSideChannel() #else @@ -1298,9 +1317,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1361,9 +1381,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb") public func _invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1424,9 +1445,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1487,9 +1509,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional @_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf") public func _invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1550,9 +1573,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi") public func _invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1560,14 +1584,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(_ boxPtr: Uns #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaKSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1588,13 +1612,13 @@ private enum _BJS_Closure_10TestModuleYaKSS_SS { return { [callback] (param0: String) async throws(JSException) -> String in #if arch(wasm32) let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -1620,9 +1644,10 @@ extension JSTypedClosure where Signature == (String) async throws(JSException) - @_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSS_SS") public func _invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in - return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -1659,9 +1684,9 @@ private enum _BJS_Closure_10TestModuleYaKSb_9APIResultO { return { [callback] (param0: Bool) async throws(JSException) -> APIResult in #if arch(wasm32) let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending APIResult) -> Void>($0) + JSTypedClosure<(sending APIResult) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let param0Value = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() @@ -1690,9 +1715,10 @@ extension JSTypedClosure where Signature == (Bool) async throws(JSException) -> @_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO") public func _invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Bool.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) async throws(JSException) -> APIResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_9APIResultO, reject: Promise_reject) { () async throws(JSException) -> APIResult in - return try await closure(Bool.bridgeJSLiftParameter(param0)) + return try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -1701,14 +1727,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(_ box #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV") -fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1729,13 +1755,13 @@ private enum _BJS_Closure_10TestModuleYaSS_6AnimalV { return { [callback] (param0: String) async -> Animal in #if arch(wasm32) let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Animal) -> Void>($0) + JSTypedClosure<(sending Animal) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -1761,9 +1787,10 @@ extension JSTypedClosure where Signature == (String) async -> Animal { @_cdecl("invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV") public func _invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> Animal>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_6AnimalV, reject: Promise_reject) { - return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -1772,14 +1799,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleYaSS_6AnimalV(_ boxPtr: #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleYaSS_SS_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1800,13 +1827,13 @@ private enum _BJS_Closure_10TestModuleYaSS_SS { return { [callback] (param0: String) async -> String in #if arch(wasm32) let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleYaSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleYaSS_SS(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -1832,9 +1859,10 @@ extension JSTypedClosure where Signature == (String) async -> String { @_cdecl("invoke_swift_closure_TestModule_10TestModuleYaSS_SS") public func _invoke_swift_closure_TestModule_10TestModuleYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { - return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -1881,8 +1909,8 @@ private enum _BJS_Closure_10TestModules6AnimalV_y { } extension JSTypedClosure where Signature == (sending Animal) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Animal) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Animal) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules6AnimalV_y, body: body, fileID: fileID, @@ -1895,8 +1923,9 @@ extension JSTypedClosure where Signature == (sending Animal) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules6AnimalV_y") public func _invoke_swift_closure_TestModule_10TestModules6AnimalV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Animal.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Animal) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Animal.bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -1942,8 +1971,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y { } extension JSTypedClosure where Signature == (sending JSValue) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, body: body, fileID: fileID, @@ -1956,8 +1985,9 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2003,8 +2033,8 @@ private enum _BJS_Closure_10TestModules9APIResultO_y { } extension JSTypedClosure where Signature == (sending APIResult) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending APIResult) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending APIResult) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules9APIResultO_y, body: body, fileID: fileID, @@ -2017,8 +2047,9 @@ extension JSTypedClosure where Signature == (sending APIResult) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules9APIResultO_y") public func _invoke_swift_closure_TestModule_10TestModules9APIResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = APIResult.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending APIResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(APIResult.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2026,14 +2057,14 @@ public func _invoke_swift_closure_TestModule_10TestModules9APIResultO_y(_ boxPtr #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y") -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2053,9 +2084,9 @@ private enum _BJS_Closure_10TestModulesSS_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -2065,8 +2096,8 @@ private enum _BJS_Closure_10TestModulesSS_y { } extension JSTypedClosure where Signature == (sending String) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSS_y, body: body, fileID: fileID, @@ -2079,8 +2110,9 @@ extension JSTypedClosure where Signature == (sending String) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y") public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2228,7 +2260,8 @@ fileprivate func _bjs_struct_lift_Animal_extern() -> Int32 { @_cdecl("bjs_Animal_init") public func _bjs_Animal_init(_ typeBytes: Int32, _ typeLength: Int32) -> Void { #if arch(wasm32) - let ret = Animal(type: String.bridgeJSLiftParameter(typeBytes, typeLength)) + let type = String.bridgeJSLiftParameter(typeBytes, typeLength) + let ret = Animal(type: type) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2239,7 +2272,8 @@ public func _bjs_Animal_init(_ typeBytes: Int32, _ typeLength: Int32) -> Void { @_cdecl("bjs_roundtripAnimal") public func _bjs_roundtripAnimal(_ animalClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripAnimal(_: _BJS_Closure_10TestModule6AnimalV_6AnimalV.bridgeJSLift(animalClosure)) + let animalClosure = _BJS_Closure_10TestModule6AnimalV_6AnimalV.bridgeJSLift(animalClosure) + let ret = roundtripAnimal(_: animalClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2250,7 +2284,8 @@ public func _bjs_roundtripAnimal(_ animalClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalAnimal") public func _bjs_roundtripOptionalAnimal(_ animalClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalAnimal(_: _BJS_Closure_10TestModuleSq6AnimalV_Sq6AnimalV.bridgeJSLift(animalClosure)) + let animalClosure = _BJS_Closure_10TestModuleSq6AnimalV_Sq6AnimalV.bridgeJSLift(animalClosure) + let ret = roundtripOptionalAnimal(_: animalClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2261,7 +2296,8 @@ public func _bjs_roundtripOptionalAnimal(_ animalClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripString") public func _bjs_roundtripString(_ stringClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripString(_: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(stringClosure)) + let stringClosure = _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(stringClosure) + let ret = roundtripString(_: stringClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2272,7 +2308,8 @@ public func _bjs_roundtripString(_ stringClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripInt") public func _bjs_roundtripInt(_ intClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripInt(_: _BJS_Closure_10TestModuleSi_Si.bridgeJSLift(intClosure)) + let intClosure = _BJS_Closure_10TestModuleSi_Si.bridgeJSLift(intClosure) + let ret = roundtripInt(_: intClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2283,7 +2320,8 @@ public func _bjs_roundtripInt(_ intClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripBool") public func _bjs_roundtripBool(_ boolClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripBool(_: _BJS_Closure_10TestModuleSb_Sb.bridgeJSLift(boolClosure)) + let boolClosure = _BJS_Closure_10TestModuleSb_Sb.bridgeJSLift(boolClosure) + let ret = roundtripBool(_: boolClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2294,7 +2332,8 @@ public func _bjs_roundtripBool(_ boolClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripFloat") public func _bjs_roundtripFloat(_ floatClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripFloat(_: _BJS_Closure_10TestModuleSf_Sf.bridgeJSLift(floatClosure)) + let floatClosure = _BJS_Closure_10TestModuleSf_Sf.bridgeJSLift(floatClosure) + let ret = roundtripFloat(_: floatClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2305,7 +2344,8 @@ public func _bjs_roundtripFloat(_ floatClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripDouble") public func _bjs_roundtripDouble(_ doubleClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripDouble(_: _BJS_Closure_10TestModuleSd_Sd.bridgeJSLift(doubleClosure)) + let doubleClosure = _BJS_Closure_10TestModuleSd_Sd.bridgeJSLift(doubleClosure) + let ret = roundtripDouble(_: doubleClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2316,7 +2356,8 @@ public func _bjs_roundtripDouble(_ doubleClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalString") public func _bjs_roundtripOptionalString(_ stringClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalString(_: _BJS_Closure_10TestModuleSqSS_SqSS.bridgeJSLift(stringClosure)) + let stringClosure = _BJS_Closure_10TestModuleSqSS_SqSS.bridgeJSLift(stringClosure) + let ret = roundtripOptionalString(_: stringClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2327,7 +2368,8 @@ public func _bjs_roundtripOptionalString(_ stringClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalInt") public func _bjs_roundtripOptionalInt(_ intClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalInt(_: _BJS_Closure_10TestModuleSqSi_SqSi.bridgeJSLift(intClosure)) + let intClosure = _BJS_Closure_10TestModuleSqSi_SqSi.bridgeJSLift(intClosure) + let ret = roundtripOptionalInt(_: intClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2338,7 +2380,8 @@ public func _bjs_roundtripOptionalInt(_ intClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalBool") public func _bjs_roundtripOptionalBool(_ boolClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalBool(_: _BJS_Closure_10TestModuleSqSb_SqSb.bridgeJSLift(boolClosure)) + let boolClosure = _BJS_Closure_10TestModuleSqSb_SqSb.bridgeJSLift(boolClosure) + let ret = roundtripOptionalBool(_: boolClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2349,7 +2392,8 @@ public func _bjs_roundtripOptionalBool(_ boolClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalFloat") public func _bjs_roundtripOptionalFloat(_ floatClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalFloat(_: _BJS_Closure_10TestModuleSqSf_SqSf.bridgeJSLift(floatClosure)) + let floatClosure = _BJS_Closure_10TestModuleSqSf_SqSf.bridgeJSLift(floatClosure) + let ret = roundtripOptionalFloat(_: floatClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2360,7 +2404,8 @@ public func _bjs_roundtripOptionalFloat(_ floatClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalDouble") public func _bjs_roundtripOptionalDouble(_ doubleClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalDouble(_: _BJS_Closure_10TestModuleSqSd_SqSd.bridgeJSLift(doubleClosure)) + let doubleClosure = _BJS_Closure_10TestModuleSqSd_SqSd.bridgeJSLift(doubleClosure) + let ret = roundtripOptionalDouble(_: doubleClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2371,7 +2416,8 @@ public func _bjs_roundtripOptionalDouble(_ doubleClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripPerson") public func _bjs_roundtripPerson(_ personClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripPerson(_: _BJS_Closure_10TestModule6PersonC_6PersonC.bridgeJSLift(personClosure)) + let personClosure = _BJS_Closure_10TestModule6PersonC_6PersonC.bridgeJSLift(personClosure) + let ret = roundtripPerson(_: personClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2382,7 +2428,8 @@ public func _bjs_roundtripPerson(_ personClosure: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalPerson") public func _bjs_roundtripOptionalPerson(_ personClosure: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalPerson(_: _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC.bridgeJSLift(personClosure)) + let personClosure = _BJS_Closure_10TestModuleSq6PersonC_Sq6PersonC.bridgeJSLift(personClosure) + let ret = roundtripOptionalPerson(_: personClosure) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2404,7 +2451,8 @@ public func _bjs_makeThrowingParser() -> Int32 { @_cdecl("bjs_validateWith") public func _bjs_validateWith(_ validate: Int32) -> Void { #if arch(wasm32) - validateWith(_: _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(validate)) + let validate = _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(validate) + validateWith(_: validate) #else fatalError("Only available on WebAssembly") #endif @@ -2458,7 +2506,8 @@ public func _bjs_makeResultLoader() -> Int32 { @_cdecl("bjs_roundtripDirection") public func _bjs_roundtripDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripDirection(_: _BJS_Closure_10TestModule9DirectionO_9DirectionO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModule9DirectionO_9DirectionO.bridgeJSLift(callback) + let ret = roundtripDirection(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2469,7 +2518,8 @@ public func _bjs_roundtripDirection(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripTheme") public func _bjs_roundtripTheme(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripTheme(_: _BJS_Closure_10TestModule5ThemeO_5ThemeO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModule5ThemeO_5ThemeO.bridgeJSLift(callback) + let ret = roundtripTheme(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2480,7 +2530,8 @@ public func _bjs_roundtripTheme(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripHttpStatus") public func _bjs_roundtripHttpStatus(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripHttpStatus(_: _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModule10HttpStatusO_10HttpStatusO.bridgeJSLift(callback) + let ret = roundtripHttpStatus(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2491,7 +2542,8 @@ public func _bjs_roundtripHttpStatus(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripAPIResult") public func _bjs_roundtripAPIResult(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripAPIResult(_: _BJS_Closure_10TestModule9APIResultO_9APIResultO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModule9APIResultO_9APIResultO.bridgeJSLift(callback) + let ret = roundtripAPIResult(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2502,7 +2554,8 @@ public func _bjs_roundtripAPIResult(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalDirection") public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback) + let ret = roundtripOptionalDirection(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2513,7 +2566,8 @@ public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalTheme") public func _bjs_roundtripOptionalTheme(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalTheme(_: _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq5ThemeO_Sq5ThemeO.bridgeJSLift(callback) + let ret = roundtripOptionalTheme(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2524,7 +2578,8 @@ public func _bjs_roundtripOptionalTheme(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalHttpStatus") public func _bjs_roundtripOptionalHttpStatus(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalHttpStatus(_: _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq10HttpStatusO_Sq10HttpStatusO.bridgeJSLift(callback) + let ret = roundtripOptionalHttpStatus(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2535,7 +2590,8 @@ public func _bjs_roundtripOptionalHttpStatus(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalAPIResult") public func _bjs_roundtripOptionalAPIResult(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalAPIResult(_: _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq9APIResultO_Sq9APIResultO.bridgeJSLift(callback) + let ret = roundtripOptionalAPIResult(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2546,7 +2602,8 @@ public func _bjs_roundtripOptionalAPIResult(_ callback: Int32) -> Int32 { @_cdecl("bjs_roundtripOptionalDirection") public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripOptionalDirection(_: _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback)) + let callback = _BJS_Closure_10TestModuleSq9DirectionO_Sq9DirectionO.bridgeJSLift(callback) + let ret = roundtripOptionalDirection(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2557,7 +2614,8 @@ public func _bjs_roundtripOptionalDirection(_ callback: Int32) -> Int32 { @_cdecl("bjs_Person_init") public func _bjs_Person_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Person(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Person(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2599,7 +2657,8 @@ fileprivate func _bjs_Person_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> @_cdecl("bjs_TestProcessor_init") public func _bjs_TestProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TestProcessor(transform: _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform)) + let transform = _BJS_Closure_10TestModuleSS_SS.bridgeJSLift(transform) + let ret = TestProcessor(transform: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -2682,20 +2741,20 @@ func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS") -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_SS_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength) + promise_resolve_TestModule_SS(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift index 6f133d748..5c22db7f2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftClosureImports.swift @@ -1,13 +1,13 @@ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleKSS_Sb") -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleKSS_Sb(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_TestModule_10TestModuleKSS_Sb_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -27,9 +27,9 @@ private enum _BJS_Closure_10TestModuleKSS_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] (param0: String) throws(JSException) -> Bool in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_TestModule_10TestModuleKSS_Sb(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -59,10 +59,11 @@ extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool @_cdecl("invoke_swift_closure_TestModule_10TestModuleKSS_Sb") public func _invoke_swift_closure_TestModule_10TestModuleKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure do { - let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = try closure(param0) + return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -136,9 +137,10 @@ extension JSTypedClosure where Signature == (Int) -> Int { @_cdecl("invoke_swift_closure_TestModule_10TestModuleSi_Si") public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -146,14 +148,14 @@ public func _invoke_swift_closure_TestModule_10TestModuleSi_Si(_ boxPtr: UnsafeM #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModuleYaKSS_SS") -fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModuleYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModuleYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -174,13 +176,13 @@ private enum _BJS_Closure_10TestModuleYaKSS_SS { return { [callback] (param0: String) async throws(JSException) -> String in #if arch(wasm32) let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModuleYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -206,9 +208,10 @@ extension JSTypedClosure where Signature == (String) async throws(JSException) - @_cdecl("invoke_swift_closure_TestModule_10TestModuleYaKSS_SS") public func _invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in - return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -255,8 +258,8 @@ private enum _BJS_Closure_10TestModules7JSValueV_y { } extension JSTypedClosure where Signature == (sending JSValue) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModules7JSValueV_y, body: body, fileID: fileID, @@ -269,8 +272,9 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModules7JSValueV_y") public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -278,14 +282,14 @@ public func _invoke_swift_closure_TestModule_10TestModules7JSValueV_y(_ boxPtr: #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_TestModule_10TestModulesSS_y") -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_TestModule_10TestModulesSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_TestModule_10TestModulesSS_y_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -305,9 +309,9 @@ private enum _BJS_Closure_10TestModulesSS_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Bytes, param0Length) + invoke_js_callback_TestModule_10TestModulesSS_y(callbackValue, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -317,8 +321,8 @@ private enum _BJS_Closure_10TestModulesSS_y { } extension JSTypedClosure where Signature == (sending String) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( makeClosure: make_swift_closure_TestModule_10TestModulesSS_y, body: body, fileID: fileID, @@ -331,8 +335,9 @@ extension JSTypedClosure where Signature == (sending String) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModulesSS_y") public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -342,7 +347,8 @@ public func _invoke_swift_closure_TestModule_10TestModulesSS_y(_ boxPtr: UnsafeM @_cdecl("bjs_runValidator") public func _bjs_runValidator(_ cb: Int32) -> Void { #if arch(wasm32) - runValidator(_: _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(cb)) + let cb = _BJS_Closure_10TestModuleKSS_Sb.bridgeJSLift(cb) + runValidator(_: cb) #else fatalError("Only available on WebAssembly") #endif @@ -352,7 +358,8 @@ public func _bjs_runValidator(_ cb: Int32) -> Void { @_cdecl("bjs_loadEach") public func _bjs_loadEach(_ fetch: Int32) -> Void { #if arch(wasm32) - loadEach(_: _BJS_Closure_10TestModuleYaKSS_SS.bridgeJSLift(fetch)) + let fetch = _BJS_Closure_10TestModuleYaKSS_SS.bridgeJSLift(fetch) + loadEach(_: fetch) #else fatalError("Only available on WebAssembly") #endif @@ -383,20 +390,20 @@ func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_TestModule_SS") -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_TestModule_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_TestModule_SS_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_TestModule_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_TestModule_SS_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_TestModule_SS(promiseValue, valueBytes, valueLength) + promise_resolve_TestModule_SS(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json index 2fcab7cb0..cdb672a18 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json @@ -701,6 +701,35 @@ "returnType" : { "string" : { + } + } + }, + { + "abiName" : "bjs_Vector2D_dot", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "dot", + "parameters" : [ + { + "label" : "_", + "name" : "components", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "double" : { + } } } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift index b4e54961c..8797a79b2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift @@ -59,7 +59,12 @@ fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 { @_cdecl("bjs_DataPoint_init") public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { #if arch(wasm32) - let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) + let optFlag = Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue) + let optCount = Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let y = Double.bridgeJSLiftParameter(y) + let x = Double.bridgeJSLiftParameter(x) + let ret = DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -358,7 +363,8 @@ public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { @_cdecl("bjs_ConfigStruct_static_defaultConfig_set") public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + ConfigStruct.defaultConfig = value #else fatalError("Only available on WebAssembly") #endif @@ -379,7 +385,8 @@ public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { @_cdecl("bjs_ConfigStruct_static_timeout_set") public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void { #if arch(wasm32) - ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + ConfigStruct.timeout = value #else fatalError("Only available on WebAssembly") #endif @@ -400,7 +407,8 @@ public func _bjs_ConfigStruct_static_computedSetting_get() -> Void { @_cdecl("bjs_ConfigStruct_static_update") public func _bjs_ConfigStruct_static_update(_ timeout: Float64) -> Float64 { #if arch(wasm32) - let ret = ConfigStruct.update(_: Double.bridgeJSLiftParameter(timeout)) + let timeout = Double.bridgeJSLiftParameter(timeout) + let ret = ConfigStruct.update(_: timeout) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -507,7 +515,8 @@ fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32 { @_cdecl("bjs_Vector2D_magnitude") public func _bjs_Vector2D_magnitude() -> Float64 { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().magnitude() + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.magnitude() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -518,7 +527,9 @@ public func _bjs_Vector2D_magnitude() -> Float64 { @_cdecl("bjs_Vector2D_scaled") public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().scaled(by: Double.bridgeJSLiftParameter(factor)) + let factor = Double.bridgeJSLiftParameter(factor) + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.scaled(by: factor) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -529,7 +540,21 @@ public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void { @_cdecl("bjs_Vector2D_describe") public func _bjs_Vector2D_describe() -> Void { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().describe() + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.describe() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Vector2D_dot") +@_cdecl("bjs_Vector2D_dot") +public func _bjs_Vector2D_dot() -> Float64 { + #if arch(wasm32) + let components = [Double].bridgeJSStackPop() + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.dot(_: components) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -540,7 +565,8 @@ public func _bjs_Vector2D_describe() -> Void { @_cdecl("bjs_roundtrip") public func _bjs_roundtrip() -> Void { #if arch(wasm32) - let ret = roundtrip(_: Person.bridgeJSLiftParameter()) + let session = Person.bridgeJSLiftParameter() + let ret = roundtrip(_: session) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -551,7 +577,8 @@ public func _bjs_roundtrip() -> Void { @_cdecl("bjs_roundtripContainer") public func _bjs_roundtripContainer() -> Void { #if arch(wasm32) - let ret = roundtripContainer(_: Container.bridgeJSLiftParameter()) + let container = Container.bridgeJSLiftParameter() + let ret = roundtripContainer(_: container) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -562,7 +589,8 @@ public func _bjs_roundtripContainer() -> Void { @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -573,7 +601,8 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -584,7 +613,8 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).name + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -595,7 +625,9 @@ public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_set") public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift index c86b122a1..076e25b7d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftTypedClosureAccess.swift @@ -52,8 +52,9 @@ extension JSTypedClosure where Signature == (JSPublicEvent) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModule13JSPublicEventC_y") public func _invoke_swift_closure_TestModule_10TestModule13JSPublicEventC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = JSPublicEvent.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(JSPublicEvent) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSPublicEvent.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -113,8 +114,9 @@ extension JSTypedClosure where Signature == (JSPackageEvent) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModule14JSPackageEventC_y") public func _invoke_swift_closure_TestModule_10TestModule14JSPackageEventC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = JSPackageEvent.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(JSPackageEvent) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSPackageEvent.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -174,8 +176,9 @@ extension JSTypedClosure where Signature == (JSInternalEvent) -> Void { @_cdecl("invoke_swift_closure_TestModule_10TestModule15JSInternalEventC_y") public func _invoke_swift_closure_TestModule_10TestModule15JSInternalEventC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = JSInternalEvent.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(JSInternalEvent) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSInternalEvent.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift index 69011da18..4179da090 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/UnsafePointer.swift @@ -56,7 +56,12 @@ fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 { @_cdecl("bjs_PointerFields_init") public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr) + let ptr = UnsafePointer.bridgeJSLiftParameter(ptr) + let opaque = OpaquePointer.bridgeJSLiftParameter(opaque) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(raw) + let ret = PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -67,7 +72,8 @@ public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: Un @_cdecl("bjs_takeUnsafeRawPointer") public func _bjs_takeUnsafeRawPointer(_ p: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeUnsafeRawPointer(_: UnsafeRawPointer.bridgeJSLiftParameter(p)) + let p = UnsafeRawPointer.bridgeJSLiftParameter(p) + takeUnsafeRawPointer(_: p) #else fatalError("Only available on WebAssembly") #endif @@ -77,7 +83,8 @@ public func _bjs_takeUnsafeRawPointer(_ p: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_takeUnsafeMutableRawPointer") public func _bjs_takeUnsafeMutableRawPointer(_ p: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeUnsafeMutableRawPointer(_: UnsafeMutableRawPointer.bridgeJSLiftParameter(p)) + let p = UnsafeMutableRawPointer.bridgeJSLiftParameter(p) + takeUnsafeMutableRawPointer(_: p) #else fatalError("Only available on WebAssembly") #endif @@ -87,7 +94,8 @@ public func _bjs_takeUnsafeMutableRawPointer(_ p: UnsafeMutableRawPointer) -> Vo @_cdecl("bjs_takeOpaquePointer") public func _bjs_takeOpaquePointer(_ p: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeOpaquePointer(_: OpaquePointer.bridgeJSLiftParameter(p)) + let p = OpaquePointer.bridgeJSLiftParameter(p) + takeOpaquePointer(_: p) #else fatalError("Only available on WebAssembly") #endif @@ -97,7 +105,8 @@ public func _bjs_takeOpaquePointer(_ p: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_takeUnsafePointer") public func _bjs_takeUnsafePointer(_ p: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeUnsafePointer(_: UnsafePointer.bridgeJSLiftParameter(p)) + let p = UnsafePointer.bridgeJSLiftParameter(p) + takeUnsafePointer(_: p) #else fatalError("Only available on WebAssembly") #endif @@ -107,7 +116,8 @@ public func _bjs_takeUnsafePointer(_ p: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_takeUnsafeMutablePointer") public func _bjs_takeUnsafeMutablePointer(_ p: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - takeUnsafeMutablePointer(_: UnsafeMutablePointer.bridgeJSLiftParameter(p)) + let p = UnsafeMutablePointer.bridgeJSLiftParameter(p) + takeUnsafeMutablePointer(_: p) #else fatalError("Only available on WebAssembly") #endif @@ -172,7 +182,8 @@ public func _bjs_returnUnsafeMutablePointer() -> UnsafeMutableRawPointer { @_cdecl("bjs_roundTripPointerFields") public func _bjs_roundTripPointerFields() -> Void { #if arch(wasm32) - let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) + let value = PointerFields.bridgeJSLiftParameter() + let ret = roundTripPointerFields(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js index b1cfb68aa..dafac12d3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Alias.js @@ -15,7 +15,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -265,7 +267,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -359,6 +361,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT16PolygonReference = { lower: (v) => { @@ -432,8 +441,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -441,8 +450,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -467,8 +476,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -496,7 +505,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -536,11 +546,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -611,19 +621,19 @@ export async function createInstantiator(options, swift) { return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_acceptTagged"] = function bjs_acceptTagged(taggedBytes, taggedCount) { + TestModule["bjs_acceptTagged"] = function bjs_acceptTagged(taggedWord0, taggedWord1, taggedWord2) { try { - const string = decodeString(taggedBytes, taggedCount); + const string = decodeString(taggedWord0, taggedWord1, taggedWord2); imports.acceptTagged(string); } catch (error) { setException(error); } } - TestModule["bjs_acceptOptionalTagged"] = function bjs_acceptOptionalTagged(taggedIsSome, taggedBytes, taggedCount) { + TestModule["bjs_acceptOptionalTagged"] = function bjs_acceptOptionalTagged(taggedIsSome, taggedWord0, taggedWord1, taggedWord2) { try { let optResult; if (taggedIsSome) { - const string = decodeString(taggedBytes, taggedCount); + const string = decodeString(taggedWord0, taggedWord1, taggedWord2); optResult = string; } else { optResult = null; @@ -633,9 +643,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_roundtripTagged"] = function bjs_roundtripTagged(taggedBytes, taggedCount) { + TestModule["bjs_roundtripTagged"] = function bjs_roundtripTagged(taggedWord0, taggedWord1, taggedWord2) { try { - const string = decodeString(taggedBytes, taggedCount); + const string = decodeString(taggedWord0, taggedWord1, taggedWord2); let ret = imports.roundtripTagged(string); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -678,10 +688,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js index fa9095cd8..4793a3d48 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AliasInClosure.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,7 +44,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -168,11 +171,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -290,10 +293,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js index 6d3992ce5..1e46aa559 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.js @@ -22,7 +22,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -272,7 +274,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -366,6 +368,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec); @@ -495,8 +504,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -504,8 +513,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -530,8 +539,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -559,7 +568,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -606,11 +616,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -740,10 +750,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js index c025cf4f0..ab64ccfa0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.js @@ -19,7 +19,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -269,7 +271,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -363,6 +365,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT10AsyncPoint = { lower: (v) => { @@ -407,8 +416,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -416,8 +425,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -442,8 +451,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -471,7 +480,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_AsyncPoint"] = function(objectId) { @@ -504,9 +514,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) { + bjs["promise_resolve_TestModule_SS"] = function(promise, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); } catch (error) { setException(error); @@ -555,9 +565,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - bjs["promise_resolve_TestModule_10AsyncThemeO"] = function(promise, valueBytes, valueCount) { + bjs["promise_resolve_TestModule_10AsyncThemeO"] = function(promise, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); } catch (error) { setException(error); @@ -570,11 +580,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - bjs["promise_resolve_TestModule_Sq10AsyncThemeO"] = function(promise, valueIsSome, valueBytes, valueCount) { + bjs["promise_resolve_TestModule_Sq10AsyncThemeO"] = function(promise, valueIsSome, valueWord0, valueWord1, valueWord2) { try { let optResult; if (valueIsSome) { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); optResult = string; } else { optResult = null; @@ -660,11 +670,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -724,10 +734,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) @@ -794,26 +952,26 @@ export async function createInstantiator(options, swift) { asyncRoundTripStructThrows: function bjs_asyncRoundTripStructThrows(v) { structHelpers.M10TestModuleT10AsyncPoint.lower(v); const ret = instance.exports.bjs_asyncRoundTripStructThrows(); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, asyncThrowsZeroArg: function bjs_asyncThrowsZeroArg() { const ret = instance.exports.bjs_asyncThrowsZeroArg(); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, asyncCombineStructs: function bjs_asyncCombineStructs(a, b) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js index 49b2ff88b..3e1483580 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncAssociatedValueEnum.js @@ -16,7 +16,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -126,6 +128,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_createEnumHelpers_M10TestModuleT18AsyncPayloadResult = () => ({ lower: (value) => { @@ -172,8 +181,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -181,8 +190,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -207,8 +216,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -236,7 +245,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -306,11 +316,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -370,10 +380,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js index 96c0d11e8..7e6c1e2c4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncImport.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -119,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -131,7 +140,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -154,8 +163,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -163,8 +172,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -189,8 +198,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -218,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -257,11 +267,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -365,10 +375,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules8JSObjectC_y); } - bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); callback(string); } catch (error) { setException(error); @@ -472,40 +482,212 @@ export async function createInstantiator(options, swift) { TestModule["bjs_asyncReturnVoid"] = function bjs_asyncReturnVoid(resolveRef, rejectRef) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncReturnVoid().then(resolve, reject); + try { + Promise.resolve(imports.asyncReturnVoid()).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripInt"] = function bjs_asyncRoundTripInt(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripInt(v).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripInt(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } - TestModule["bjs_asyncRoundTripString"] = function bjs_asyncRoundTripString(resolveRef, rejectRef, vBytes, vCount) { + TestModule["bjs_asyncRoundTripString"] = function bjs_asyncRoundTripString(resolveRef, rejectRef, vWord0, vWord1, vWord2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const string = decodeString(vBytes, vCount); - imports.asyncRoundTripString(string).then(resolve, reject); + try { + const string = decodeString(vWord0, vWord1, vWord2); + Promise.resolve(imports.asyncRoundTripString(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripBool"] = function bjs_asyncRoundTripBool(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripBool(v !== 0).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripBool(v !== 0)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripDouble"] = function bjs_asyncRoundTripDouble(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripDouble(v).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripDouble(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_asyncRoundTripJSObject"] = function bjs_asyncRoundTripJSObject(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.asyncRoundTripJSObject(swift.memory.getObject(v)).then(resolve, reject); + try { + Promise.resolve(imports.asyncRoundTripJSObject(swift.memory.getObject(v))).then(resolve, reject); + } catch (error) { + reject(error); + } } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js index eea340c35..0b854158d 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -119,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -131,7 +140,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -154,8 +163,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -163,8 +172,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -189,8 +198,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -218,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -257,11 +267,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -389,19 +399,175 @@ export async function createInstantiator(options, swift) { TestModule["bjs_AsyncBox_asyncStaticRoundTrip_static"] = function bjs_AsyncBox_asyncStaticRoundTrip_static(resolveRef, rejectRef, v) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.AsyncBox.asyncStaticRoundTrip(v).then(resolve, reject); + try { + Promise.resolve(imports.AsyncBox.asyncStaticRoundTrip(v)).then(resolve, reject); + } catch (error) { + reject(error); + } } TestModule["bjs_AsyncBox_asyncStaticVoid_static"] = function bjs_AsyncBox_asyncStaticVoid_static(resolveRef, rejectRef) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - imports.AsyncBox.asyncStaticVoid().then(resolve, reject); + try { + Promise.resolve(imports.AsyncBox.asyncStaticVoid()).then(resolve, reject); + } catch (error) { + reject(error); + } } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js index ecdb0b059..08cab592c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ClassWithNestedTypes.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -56,8 +58,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -65,8 +67,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -91,8 +93,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -120,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Account_Credentials"] = function(objectId) { @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -239,10 +242,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js index fe1fa7b54..f8a62adb1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.js @@ -15,7 +15,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -265,7 +267,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -359,6 +361,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT6Config = { lower: (v) => { @@ -405,8 +414,8 @@ export async function createInstantiator(options, swift) { }.bind(instance1); instance1.multiply = function(a, b) { structHelpers.M10TestModuleT14MathOperations.lower(this); - const ret1 = instance.exports.bjs_MathOperations_multiply(a, b); - return ret1; + const ret = instance.exports.bjs_MathOperations_multiply(a, b); + return ret; }.bind(instance1); return instance1; } @@ -419,8 +428,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -428,8 +437,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -454,8 +463,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -483,7 +492,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Config"] = function(objectId) { @@ -537,11 +547,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -617,10 +627,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js index 8ccda3c19..6e763b743 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DictionaryTypes.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Dict_Int = __bjs_dictCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Dict_String = __bjs_dictCodec(__bjs_stringCodec); @@ -399,8 +408,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -408,8 +417,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -434,8 +443,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -463,7 +472,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Counters"] = function(objectId) { @@ -510,11 +520,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -592,10 +602,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js index 6d23d394f..aa3ac20c9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DocComments.js @@ -15,7 +15,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -56,8 +58,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -65,8 +67,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -91,8 +93,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -120,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -256,10 +259,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js index d8bc06fcf..00725576a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAlias.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -215,10 +218,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js index 66f85760c..3369c92f9 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.js @@ -90,7 +90,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -340,7 +342,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -434,6 +436,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Optional_String = __bjs_optionalCodec(__bjs_stringCodec); const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool); @@ -994,8 +1003,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -1003,8 +1012,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -1029,8 +1038,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -1058,7 +1067,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -1105,11 +1115,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -1177,10 +1187,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js index 2b36953bb..df18151cc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js @@ -16,7 +16,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -84,8 +86,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -93,8 +95,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -119,8 +121,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -148,7 +150,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -188,11 +191,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -301,10 +304,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js index 838e3062b..5e55689ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCase.js @@ -33,7 +33,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -63,8 +65,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -72,8 +74,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -98,8 +100,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -127,7 +129,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -231,10 +234,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js index bde5fc31f..20e16735c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -45,8 +47,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -54,8 +56,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -80,8 +82,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -109,7 +111,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -149,11 +152,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -239,10 +242,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js index 0a691374b..a8a01bda5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js @@ -53,7 +53,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -83,8 +85,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -92,8 +94,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -118,8 +120,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -147,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -187,11 +190,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -271,10 +274,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js index 03f0a8d9a..e63ffc2ff 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js @@ -34,7 +34,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -168,11 +171,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -252,10 +255,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js index 09e03e44a..299a1d730 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumRawType.js @@ -84,7 +84,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -334,7 +336,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -428,6 +430,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT8FileSize = { lower: (v) => { @@ -459,8 +468,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -468,8 +477,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -494,8 +503,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -523,7 +532,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -563,11 +573,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -626,9 +636,9 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flagBytes, flagCount) { + TestModule["bjs_takesFeatureFlag"] = function bjs_takesFeatureFlag(flagWord0, flagWord1, flagWord2) { try { - const string = decodeString(flagBytes, flagCount); + const string = decodeString(flagWord0, flagWord1, flagWord2); imports.takesFeatureFlag(string); } catch (error) { setException(error); @@ -645,10 +655,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js index d031ff64b..b573e3559 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionNestedTypes.js @@ -25,7 +25,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -59,10 +61,10 @@ export async function createInstantiator(options, swift) { const instance1 = { label: string }; instance1.describeShelf = function() { structHelpers.M10TestModuleT7LibraryT5Shelf.lower(this); - const ret = instance.exports.bjs_Library_Shelf_describeShelf(); - const ret1 = tmpRetString; + instance.exports.bjs_Library_Shelf_describeShelf(); + const ret = tmpRetString; tmpRetString = undefined; - return ret1; + return ret; }.bind(instance1); return instance1; } @@ -110,8 +112,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -119,8 +121,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -145,8 +147,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -174,7 +176,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) { @@ -228,11 +231,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -300,10 +303,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js index 6cc339d24..094d37c11 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionOrderIndependence.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -43,10 +45,10 @@ export async function createInstantiator(options, swift) { const instance1 = { label: string }; instance1.describeCrate = function() { structHelpers.M10TestModuleT5DepotT5Crate.lower(this); - const ret = instance.exports.bjs_Depot_Crate_describeCrate(); - const ret1 = tmpRetString; + instance.exports.bjs_Depot_Crate_describeCrate(); + const ret = tmpRetString; tmpRetString = undefined; - return ret1; + return ret; }.bind(instance1); return instance1; } @@ -59,8 +61,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -68,8 +70,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -94,8 +96,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -123,7 +125,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Depot_Crate"] = function(objectId) { @@ -170,11 +173,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -242,10 +245,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js index 6b8ae44b1..ca1cf7361 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ExtensionScopeParity.js @@ -13,7 +13,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -55,8 +57,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -90,8 +92,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -119,7 +121,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Meta"] = function(objectId) { @@ -166,11 +169,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -242,10 +245,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js index 56a31b784..636aacd1e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/FixedWidthIntegers.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -280,10 +283,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts index 026713ce3..8ff2aad15 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.d.ts @@ -4,6 +4,17 @@ // To update this file, just rebuild your project or run // `swift package bridge-js`. +export interface GenericReadable { + read(): number; +} + +export interface GenericWritable { + value: number; +} + +export interface GenericNode extends GenericReadable, GenericWritable { +} + export const GenericColorValues: { readonly Red: 0; readonly Green: 1; @@ -53,6 +64,9 @@ export interface GenericConsumer { accept(value: T): void; identity(value: T): T; } +export interface ConstrainedConsumer { + accept(value: T): T; +} export type Exports = { GenericColor: GenericColorObject GenericMode: GenericModeObject @@ -70,6 +84,8 @@ export type Imports = { importGenericOptional(value: T | null): T | null; importGenericDictionary(values: Record): Record; importGenericAfterOptionalArray(values: number[] | null, value: T): T; + constrainedRoundTrip(value: T): T; + constrainedComposition(value: T): T; GenericPairFactory: { new(tag: string, first: T, second: U): GenericPairFactory; } @@ -77,6 +93,10 @@ export type Imports = { new(value: T): GenericConsumer; box(value: T): T; } + ConstrainedConsumer: { + new(value: T): ConstrainedConsumer; + identity(value: T): T; + } } export function createInstantiator(options: { imports: Imports; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js index d8b1fdf15..a39fe8bd7 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js @@ -25,7 +25,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -293,7 +295,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -387,6 +389,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Optional_Array_Int = __bjs_optionalCodec(__bjs_codec_Array_Int); @@ -428,6 +437,30 @@ export async function createInstantiator(options, swift) { return enumValue; }, }; + const __bjs_codec_M10TestModuleT15GenericReadable = { + lower: (v) => { + const objId = swift.memory.retain(v); + i32Stack.push(objId); + }, + lift: () => { + const objId = i32Stack.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + return obj; + }, + }; + const __bjs_codec_M10TestModuleT11GenericNode = { + lower: (v) => { + const objId = swift.memory.retain(v); + i32Stack.push(objId); + }, + lift: () => { + const objId = i32Stack.pop(); + const obj = swift.memory.getObject(objId); + swift.memory.release(objId); + return obj; + }, + }; const __bjs_createStructHelpers_M10TestModuleT12GenericPoint = () => ({ lower: (value) => { @@ -482,8 +515,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -491,8 +524,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -517,8 +550,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -546,7 +579,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_GenericPoint"] = function(objectId) { @@ -586,6 +620,8 @@ export async function createInstantiator(options, swift) { __bjs_codec_M10TestModuleT12GenericColor, __bjs_stringCodec, __bjs_codec_M10TestModuleT13GenericTagged, + __bjs_codec_M10TestModuleT15GenericReadable, + __bjs_codec_M10TestModuleT11GenericNode, ]; const typeIds = new Int32Array(memory.buffer, base >>> 0, count >>> 0); for (let i = 0; i < count; i++) { @@ -627,11 +663,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -708,10 +744,10 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_genericParse"] = function bjs_genericParse(jsonBytes, jsonCount, tTypeId) { + TestModule["bjs_genericParse"] = function bjs_genericParse(jsonWord0, jsonWord1, jsonWord2, tTypeId) { try { const codecT = __bjs_codecForTypeId(tTypeId); - const string = decodeString(jsonBytes, jsonCount); + const string = decodeString(jsonWord0, jsonWord1, jsonWord2); let ret = imports.genericParse(string); codecT.lower(ret); } catch (error) { @@ -783,11 +819,31 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_GenericPairFactory_init"] = function bjs_GenericPairFactory_init(tagBytes, tagCount, tTypeId, uTypeId) { + TestModule["bjs_constrainedRoundTrip"] = function bjs_constrainedRoundTrip(tTypeId) { + try { + const codecT = __bjs_codecForTypeId(tTypeId); + const value = codecT.lift(); + let ret = imports.constrainedRoundTrip(value); + codecT.lower(ret); + } catch (error) { + setException(error); + } + } + TestModule["bjs_constrainedComposition"] = function bjs_constrainedComposition(tTypeId) { + try { + const codecT = __bjs_codecForTypeId(tTypeId); + const value = codecT.lift(); + let ret = imports.constrainedComposition(value); + codecT.lower(ret); + } catch (error) { + setException(error); + } + } + TestModule["bjs_GenericPairFactory_init"] = function bjs_GenericPairFactory_init(tagWord0, tagWord1, tagWord2, tTypeId, uTypeId) { try { const codecT = __bjs_codecForTypeId(tTypeId); const codecU = __bjs_codecForTypeId(uTypeId); - const string = decodeString(tagBytes, tagCount); + const string = decodeString(tagWord0, tagWord1, tagWord2); const first = codecT.lift(); const second = codecU.lift(); return swift.memory.retain(new imports.GenericPairFactory(string, first, second)); @@ -835,12 +891,215 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_ConstrainedConsumer_init"] = function bjs_ConstrainedConsumer_init(tTypeId) { + try { + const codecT = __bjs_codecForTypeId(tTypeId); + const value = codecT.lift(); + return swift.memory.retain(new imports.ConstrainedConsumer(value)); + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_ConstrainedConsumer_identity_static"] = function bjs_ConstrainedConsumer_identity_static(tTypeId) { + try { + const codecT = __bjs_codecForTypeId(tTypeId); + const value = codecT.lift(); + let ret = imports.ConstrainedConsumer.identity(value); + codecT.lower(ret); + } catch (error) { + setException(error); + } + } + TestModule["bjs_ConstrainedConsumer_accept"] = function bjs_ConstrainedConsumer_accept(self, tTypeId) { + try { + const codecT = __bjs_codecForTypeId(tTypeId); + const value = codecT.lift(); + let ret = swift.memory.getObject(self).accept(value); + codecT.lower(ret); + } catch (error) { + setException(error); + } + } + TestModule["bjs_GenericReadable_read"] = function bjs_GenericReadable_read(self) { + try { + let ret = swift.memory.getObject(self).read(); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_GenericWritable_value_get"] = function bjs_GenericWritable_value_get(self) { + try { + let ret = swift.memory.getObject(self).value; + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_GenericWritable_value_set"] = function bjs_GenericWritable_value_set(self, value) { + try { + swift.memory.getObject(self).value = value; + } catch (error) { + setException(error); + } + } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js index adb70913c..6917cc24e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalGetter.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -215,9 +218,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, messageBytes, messageCount) { + TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, messageWord0, messageWord1, messageWord2) { try { - const string = decodeString(messageBytes, messageCount); + const string = decodeString(messageWord0, messageWord1, messageWord2); swift.memory.getObject(self).log(string); } catch (error) { setException(error); @@ -225,10 +228,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js index 760a6b50c..435110d18 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GlobalThisImports.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -214,9 +217,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_parseInt"] = function bjs_parseInt(stringBytes, stringCount) { + TestModule["bjs_parseInt"] = function bjs_parseInt(stringWord0, stringWord1, stringWord2) { try { - const string = decodeString(stringBytes, stringCount); + const string = decodeString(stringWord0, stringWord1, stringWord2); let ret = globalThis.parseInt(string); return ret; } catch (error) { @@ -224,17 +227,17 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, messageBytes, messageCount) { + TestModule["bjs_JSConsole_log"] = function bjs_JSConsole_log(self, messageWord0, messageWord1, messageWord2) { try { - const string = decodeString(messageBytes, messageCount); + const string = decodeString(messageWord0, messageWord1, messageWord2); swift.memory.getObject(self).log(string); } catch (error) { setException(error); } } - TestModule["bjs_WebSocket_init"] = function bjs_WebSocket_init(urlBytes, urlCount) { + TestModule["bjs_WebSocket_init"] = function bjs_WebSocket_init(urlWord0, urlWord1, urlWord2) { try { - const string = decodeString(urlBytes, urlCount); + const string = decodeString(urlWord0, urlWord1, urlWord2); return swift.memory.retain(new globalThis.WebSocket(string)); } catch (error) { setException(error); @@ -250,10 +253,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js index 1e1d14696..308778af0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.ConfigPointer.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -222,10 +225,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js index c85aee3af..e1717e32e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.PerClass.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -222,10 +225,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js index c85aee3af..e1717e32e 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/IdentityModeClass.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -222,10 +225,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js index c92ea6ad3..56a1489f5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportArray.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_Int = __bjs_arrayCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Array_String = __bjs_arrayCodec(__bjs_stringCodec); @@ -367,8 +376,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -376,8 +385,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -402,8 +411,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -431,7 +440,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -470,11 +480,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -561,9 +571,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_borrowedStringAroundStackParams"] = function bjs_borrowedStringAroundStackParams(sBytes, sCount) { + TestModule["bjs_borrowedStringAroundStackParams"] = function bjs_borrowedStringAroundStackParams(sWord0, sWord1, sWord2) { try { - const string = decodeString(sBytes, sCount); + const string = decodeString(sWord0, sWord1, sWord2); const optValue = __bjs_codec_Optional_Array_Int.lift(); const arrayResult = __bjs_codec_Array_Int.lift(); let ret = imports.borrowedStringAroundStackParams(string, optValue, arrayResult); @@ -575,10 +585,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js index 363f6c595..ea45f4fb1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Foo = { lower: (v) => { @@ -403,8 +412,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -412,8 +421,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -438,8 +447,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -467,7 +476,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_FooContainer"] = function(objectId) { @@ -514,11 +524,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -587,10 +597,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) @@ -605,14 +763,14 @@ export async function createInstantiator(options, swift) { const exports = { makeFoo: function bjs_makeFoo() { const ret = instance.exports.bjs_makeFoo(); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }, processFooArray: function bjs_processFooArray(foos) { diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js index e8fe5ec10..8de2a8dc0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/InvalidPropertyNames.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -296,9 +299,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WeirdNaming_normalProperty_set"] = function bjs_WeirdNaming_normalProperty_set(self, newValueBytes, newValueCount) { + TestModule["bjs_WeirdNaming_normalProperty_set"] = function bjs_WeirdNaming_normalProperty_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self).normalProperty = string; } catch (error) { setException(error); @@ -318,9 +321,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WeirdNaming_property_with_spaces_set"] = function bjs_WeirdNaming_property_with_spaces_set(self, newValueBytes, newValueCount) { + TestModule["bjs_WeirdNaming_property_with_spaces_set"] = function bjs_WeirdNaming_property_with_spaces_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self)["property with spaces"] = string; } catch (error) { setException(error); @@ -333,25 +336,25 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WeirdNaming_constructor_set"] = function bjs_WeirdNaming_constructor_set(self, newValueBytes, newValueCount) { + TestModule["bjs_WeirdNaming_constructor_set"] = function bjs_WeirdNaming_constructor_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self).constructor = string; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_for_set"] = function bjs_WeirdNaming_for_set(self, newValueBytes, newValueCount) { + TestModule["bjs_WeirdNaming_for_set"] = function bjs_WeirdNaming_for_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self).for = string; } catch (error) { setException(error); } } - TestModule["bjs_WeirdNaming_any_set"] = function bjs_WeirdNaming_any_set(self, newValueBytes, newValueCount) { + TestModule["bjs_WeirdNaming_any_set"] = function bjs_WeirdNaming_any_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self).Any = string; } catch (error) { setException(error); @@ -388,10 +391,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js index 15b48d4b9..732b4aaec 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClass.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -215,9 +218,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_Greeter_init"] = function bjs_Greeter_init(nameBytes, nameCount) { + TestModule["bjs_Greeter_init"] = function bjs_Greeter_init(nameWord0, nameWord1, nameWord2) { try { - const string = decodeString(nameBytes, nameCount); + const string = decodeString(nameWord0, nameWord1, nameWord2); return swift.memory.retain(new imports.Greeter(string)); } catch (error) { setException(error); @@ -242,9 +245,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_Greeter_name_set"] = function bjs_Greeter_name_set(self, newValueBytes, newValueCount) { + TestModule["bjs_Greeter_name_set"] = function bjs_Greeter_name_set(self, newValueWord0, newValueWord1, newValueWord2) { try { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); swift.memory.getObject(self).name = string; } catch (error) { setException(error); @@ -259,9 +262,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_Greeter_changeName"] = function bjs_Greeter_changeName(self, nameBytes, nameCount) { + TestModule["bjs_Greeter_changeName"] = function bjs_Greeter_changeName(self, nameWord0, nameWord1, nameWord2) { try { - const string = decodeString(nameBytes, nameCount); + const string = decodeString(nameWord0, nameWord1, nameWord2); swift.memory.getObject(self).changeName(string); } catch (error) { setException(error); @@ -287,10 +290,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js index 5eaba3c8f..abd4e32d5 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -270,10 +273,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js index 6d1b1b6fb..f72355ae0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModule.js @@ -15,7 +15,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -45,8 +47,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -54,8 +56,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -80,8 +82,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -109,7 +111,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -148,11 +151,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -229,9 +232,9 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_nodeBasename"] = function bjs_nodeBasename(pathBytes, pathCount) { + TestModule["bjs_nodeBasename"] = function bjs_nodeBasename(pathWord0, pathWord1, pathWord2) { try { - const string = decodeString(pathBytes, pathCount); + const string = decodeString(pathWord0, pathWord1, pathWord2); let ret = __bjs_import_3_basename(string); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -239,9 +242,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_nodeDirname"] = function bjs_nodeDirname(pathBytes, pathCount) { + TestModule["bjs_nodeDirname"] = function bjs_nodeDirname(pathWord0, pathWord1, pathWord2) { try { - const string = decodeString(pathBytes, pathCount); + const string = decodeString(pathWord0, pathWord1, pathWord2); let ret = __bjs_import_3_dirname(string); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -295,10 +298,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js index 9428698be..bf2c55047 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportBareModuleFallback.js @@ -12,7 +12,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,8 +44,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -51,8 +53,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -77,8 +79,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -106,7 +108,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -145,11 +148,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -226,10 +229,10 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_joinPaths"] = function bjs_joinPaths(lhsBytes, lhsCount, rhsBytes, rhsCount) { + TestModule["bjs_joinPaths"] = function bjs_joinPaths(lhsWord0, lhsWord1, lhsWord2, rhsWord0, rhsWord1, rhsWord2) { try { - const string = decodeString(lhsBytes, lhsCount); - const string1 = decodeString(rhsBytes, rhsCount); + const string = decodeString(lhsWord0, lhsWord1, lhsWord2); + const string1 = decodeString(rhsWord0, rhsWord1, rhsWord2); let ret = __bjs_import_0_join(string, string1); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -239,10 +242,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js index aacf5e61a..130c0367c 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSImportModule.js @@ -12,7 +12,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,8 +44,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -51,8 +53,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -77,8 +79,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -106,7 +108,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -145,11 +148,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -279,10 +282,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js index 68ac11976..5025b2803 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameOverride.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -61,8 +63,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -70,8 +72,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -96,8 +98,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -125,7 +127,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_RenamedVector"] = function(objectId) { @@ -172,11 +175,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -244,10 +247,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.d.ts new file mode 100644 index 000000000..e7a00d877 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.d.ts @@ -0,0 +1,40 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const PublicChoiceValues: { + readonly First: 0; + readonly Second: 1; +}; +export type PublicChoiceTag = typeof PublicChoiceValues[keyof typeof PublicChoiceValues]; + +export type PublicChoiceObject = typeof PublicChoiceValues; + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface PublicBox extends SwiftHeapObject { + copy(): PublicBox; +} +export type Exports = { + renamedChoice(value: PublicChoiceTag): PublicChoiceTag; + PublicChoice: PublicChoiceObject + PublicBox: { + new(): PublicBox; + }, +} +export type Imports = { +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js new file mode 100644 index 000000000..bbd490bd5 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSNameTypes.js @@ -0,0 +1,464 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export const PublicChoiceValues = { + First: 0, + Second: 1, +}; + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + let decodeString; + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let strStack = []; + let i32Stack = []; + let i64Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; + let taStack = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_i32"] = function(v) { + i32Stack.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + f32Stack.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + f64Stack.push(v); + } + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); + strStack.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return i32Stack.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return f32Stack.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return f64Stack.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + ptrStack.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return ptrStack.pop(); + } + bjs["swift_js_push_i64"] = function(v) { + i64Stack.push(v); + } + bjs["swift_js_pop_i64"] = function() { + return i64Stack.pop(); + } + const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array]; + bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { + const Ctor = taCtors[kind]; + const byteLen = count * Ctor.BYTES_PER_ELEMENT; + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); + taStack.push(Array.from(new Ctor(copy))); + } + bjs["bjs_core_register_type_handles"] = function() {}; + bjs["bjs_TestModule_register_type_handles"] = function() {}; + const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers"); + bjs["swift_js_make_promise"] = function() { + let resolve, reject; + const promise = new Promise((res, rej) => { resolve = res; reject = rej; }); + promise[__bjs_promiseSettlers] = { resolve, reject }; + return swift.memory.retain(promise); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = decodeString(word0, word1, word2); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + bjs["swift_js_closure_unregister"] = function(funcRef) {} + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_SwiftBox_wrap"] = function(pointer) { + const obj = _exports['PublicBox'].__construct(pointer); + return swift.memory.retain(obj); + }; + }, + setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); + instance = i; + memory = instance.exports.memory; + + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + }); + + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype, identityCache) { + pointer = pointer >>> 0; + const makeFresh = (identityMap) => { + const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false, identityMap }; + obj.pointer = pointer; + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); + if (identityMap) { + identityMap.set(pointer, new WeakRef(obj)); + } + return obj; + }; + + if (!identityCache) { + return makeFresh(null); + } + + const cached = identityCache.get(pointer)?.deref(); + if (cached && !cached.__swiftHeapObjectState.hasReleased) { + deinit(pointer); + return cached; + } + if (identityCache.has(pointer)) { + identityCache.delete(pointer); + } + + return makeFresh(identityCache); + } + + release() { + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + } + } + class PublicBox extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_SwiftBox_deinit, PublicBox.prototype, null); + } + + constructor() { + const ret = instance.exports.bjs_SwiftBox_init(); + return PublicBox.__construct(ret); + } + copy() { + const ret = instance.exports.bjs_SwiftBox_copy(this.pointer); + return PublicBox.__construct(ret); + } + } + const exports = { + renamedChoice: function bjs_renamedChoice(value) { + const ret = instance.exports.bjs_renamedChoice(value); + return ret; + }, + PublicChoice: PublicChoiceValues, + PublicBox, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js index f02f6bcf2..8ce616dd0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -206,10 +209,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js index 9fe12ff47..37c4134d6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSValue.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Array_JSValue = __bjs_arrayCodec(__bjs_primitiveCodecs.JSValue); const __bjs_codec_Optional_Array_JSValue = __bjs_optionalCodec(__bjs_codec_Array_JSValue); @@ -366,8 +375,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -375,8 +384,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -401,8 +410,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -430,7 +439,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -469,11 +479,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -563,10 +573,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) @@ -671,7 +829,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } echoOptional(value) { @@ -694,7 +852,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; @@ -706,7 +864,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; } set value(value) { @@ -721,7 +879,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; @@ -751,7 +909,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, roundTripOptionalJSValue: function bjs_roundTripOptionalJSValue(value) { @@ -774,7 +932,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); optResult = jsValue; } else { optResult = null; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js index 5db38dde5..dfe74e98b 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -214,10 +217,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js index 66818952b..4219f5249 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -222,10 +225,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js index a732808a6..405be1d28 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -214,10 +217,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js index 082d85f65..db7ead8eb 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NamespacedClassSignature.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,7 +44,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -266,10 +269,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js index ea49220de..a40655ea6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT7Greeter = { lower: (v) => { @@ -374,8 +383,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -383,8 +392,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -409,8 +418,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -438,7 +447,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -477,11 +487,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -561,10 +571,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js index 25bd44d05..815e564be 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT7Greeter = { lower: (v) => { @@ -374,8 +383,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -383,8 +392,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -409,8 +418,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -438,7 +447,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -477,11 +487,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -561,10 +571,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js index f57c4007b..a1c133290 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedType.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_User_Stats"] = function(objectId) { @@ -182,11 +185,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -258,10 +261,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js index 1f4400ce9..b9697fc97 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/NestedTypeNameCollision.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -60,8 +62,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -69,8 +71,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -95,8 +97,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -124,7 +126,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Catalog_Entry"] = function(objectId) { @@ -178,11 +181,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -242,10 +245,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js index b63f360e9..ac372c3d1 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Optionals.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_JSObject = { lower: (v) => { @@ -390,8 +399,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -399,8 +408,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -425,8 +434,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -454,7 +463,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -493,11 +503,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -568,18 +578,18 @@ export async function createInstantiator(options, swift) { return swift.memory.retain(obj); }; const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_WithOptionalJSClass_init"] = function bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullBytes, valueOrNullCount, valueOrUndefinedIsSome, valueOrUndefinedBytes, valueOrUndefinedCount) { + TestModule["bjs_WithOptionalJSClass_init"] = function bjs_WithOptionalJSClass_init(valueOrNullIsSome, valueOrNullWord0, valueOrNullWord1, valueOrNullWord2, valueOrUndefinedIsSome, valueOrUndefinedWord0, valueOrUndefinedWord1, valueOrUndefinedWord2) { try { let optResult; if (valueOrNullIsSome) { - const string = decodeString(valueOrNullBytes, valueOrNullCount); + const string = decodeString(valueOrNullWord0, valueOrNullWord1, valueOrNullWord2); optResult = string; } else { optResult = null; } let optResult1; if (valueOrUndefinedIsSome) { - const string1 = decodeString(valueOrUndefinedBytes, valueOrUndefinedCount); + const string1 = decodeString(valueOrUndefinedWord0, valueOrUndefinedWord1, valueOrUndefinedWord2); optResult1 = string1; } else { optResult1 = undefined; @@ -670,11 +680,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_stringOrNull_set"] = function bjs_WithOptionalJSClass_stringOrNull_set(self, newValueIsSome, newValueBytes, newValueCount) { + TestModule["bjs_WithOptionalJSClass_stringOrNull_set"] = function bjs_WithOptionalJSClass_stringOrNull_set(self, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) { try { let optResult; if (newValueIsSome) { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); optResult = string; } else { optResult = null; @@ -684,11 +694,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_stringOrUndefined_set"] = function bjs_WithOptionalJSClass_stringOrUndefined_set(self, newValueIsSome, newValueBytes, newValueCount) { + TestModule["bjs_WithOptionalJSClass_stringOrUndefined_set"] = function bjs_WithOptionalJSClass_stringOrUndefined_set(self, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) { try { let optResult; if (newValueIsSome) { - const string = decodeString(newValueBytes, newValueCount); + const string = decodeString(newValueWord0, newValueWord1, newValueWord2); optResult = string; } else { optResult = undefined; @@ -747,11 +757,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_roundTripStringOrNull"] = function bjs_WithOptionalJSClass_roundTripStringOrNull(self, valueIsSome, valueBytes, valueCount) { + TestModule["bjs_WithOptionalJSClass_roundTripStringOrNull"] = function bjs_WithOptionalJSClass_roundTripStringOrNull(self, valueIsSome, valueWord0, valueWord1, valueWord2) { try { let optResult; if (valueIsSome) { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); optResult = string; } else { optResult = null; @@ -763,11 +773,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_WithOptionalJSClass_roundTripStringOrUndefined"] = function bjs_WithOptionalJSClass_roundTripStringOrUndefined(self, valueIsSome, valueBytes, valueCount) { + TestModule["bjs_WithOptionalJSClass_roundTripStringOrUndefined"] = function bjs_WithOptionalJSClass_roundTripStringOrUndefined(self, valueIsSome, valueWord0, valueWord1, valueWord2) { try { let optResult; if (valueIsSome) { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); optResult = string; } else { optResult = undefined; @@ -843,10 +853,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js index d4480a65c..2d89454c2 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveParameters.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -215,10 +218,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js index e9b298fb2..d3b49e4f3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PrimitiveReturn.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -226,10 +229,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js index beb9417df..d136df4fc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/PropertyTypes.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -214,10 +217,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts index a413fa500..4259fb347 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.d.ts @@ -17,6 +17,10 @@ export interface MyViewControllerDelegate { createEnum(): ExampleEnumTag; handleResult(result: ResultTag): void; getResult(): ResultTag; + validate(value: number): number; + loadLabel(key: string): Promise; + reset(): Promise; + fetchCount(): Promise; eventCount: number; readonly delegateName: string; optionalName: string | null; @@ -87,6 +91,9 @@ export interface MyViewController extends SwiftHeapObject { updateLabel(prefix: string, suffix: string): void; checkEvenCount(): boolean; sendHelper(helper: Helper): void; + validateValue(value: number): number; + loadLabel(key: string): Promise; + validatedDelegate(): MyViewControllerDelegate; delegate: MyViewControllerDelegate; secondDelegate: MyViewControllerDelegate | null; } diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js index f0c2d3fae..5ab588886 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Protocol.js @@ -33,7 +33,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -283,7 +285,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -377,6 +379,38 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } + + const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.unregistered) { return; } + instance?.exports?.bjs_release_swift_closure(state.pointer); + }); + const makeClosure = (pointer, file, line, func) => { + const state = { pointer, file, line, unregistered: false }; + const real = (...args) => { + if (state.unregistered) { + const bytes = new Uint8Array(memory.buffer, state.file >>> 0); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = decodeUTF8(state.file, length); + throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); + } + return func(...args); + }; + real.__unregister = () => { + if (state.unregistered) { return; } + state.unregistered = true; + swiftClosureRegistry.unregister(state); + }; + swiftClosureRegistry.register(real, state, state); + return swift.memory.retain(real); + }; const __bjs_codec_M10TestModuleT24MyViewControllerDelegate = { lower: (v) => { @@ -434,8 +468,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -443,8 +477,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -469,8 +503,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -498,7 +532,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -510,6 +545,22 @@ export async function createInstantiator(options, swift) { promise[__bjs_promiseSettlers] = { resolve, reject }; return swift.memory.retain(promise); } + bjs["promise_resolve_TestModule_SS"] = function(promise, valueWord0, valueWord1, valueWord2) { + try { + const string = decodeString(valueWord0, valueWord1, valueWord2); + swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); + } catch (error) { + setException(error); + } + } + bjs["promise_reject_TestModule"] = function(promise, valueKind, valuePayload1, valuePayload2) { + try { + const jsValue = __bjs_jsValueLift(valueKind, valuePayload1, valuePayload2); + swift.memory.getObject(promise)[__bjs_promiseSettlers].reject(jsValue); + } catch (error) { + setException(error); + } + } bjs["swift_js_return_optional_bool"] = function(isSome, value) { if (isSome === 0) { tmpRetOptionalBool = null; @@ -538,11 +589,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -600,6 +651,95 @@ export async function createInstantiator(options, swift) { return pointer || 0; } bjs["swift_js_closure_unregister"] = function(funcRef) {} + bjs["swift_js_closure_unregister"] = function(funcRef) { + const func = swift.memory.getObject(funcRef); + func.__unregister(); + } + bjs["invoke_js_callback_TestModule_10TestModules7JSValueV_y"] = function(callbackId, param0Kind, param0Payload1, param0Payload2) { + try { + const callback = swift.memory.getObject(callbackId); + const jsValue = __bjs_jsValueLift(param0Kind, param0Payload1, param0Payload2); + callback(jsValue); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModules7JSValueV_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModules7JSValueV_y = function(param0) { + const [param0Kind, param0Payload1, param0Payload2] = __bjs_jsValueLower(param0); + instance.exports.invoke_swift_closure_TestModule_10TestModules7JSValueV_y(boxPtr, param0Kind, param0Payload1, param0Payload2); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules7JSValueV_y); + } + bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Word0, param0Word1, param0Word2) { + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + callback(string); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModulesSS_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModulesSS_y = function(param0) { + const param0Bytes = textEncoder.encode(param0); + const param0Id = swift.memory.retain(param0Bytes); + instance.exports.invoke_swift_closure_TestModule_10TestModulesSS_y(boxPtr, param0Id, param0Bytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSS_y); + } + bjs["invoke_js_callback_TestModule_10TestModulesSi_y"] = function(callbackId, param0) { + try { + const callback = swift.memory.getObject(callbackId); + callback(param0); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModulesSi_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModulesSi_y = function(param0) { + instance.exports.invoke_swift_closure_TestModule_10TestModulesSi_y(boxPtr, param0); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModulesSi_y); + } + bjs["invoke_js_callback_TestModule_10TestModuley_y"] = function(callbackId) { + try { + const callback = swift.memory.getObject(callbackId); + callback(); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModuley_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuley_y = function() { + instance.exports.invoke_swift_closure_TestModule_10TestModuley_y(boxPtr); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_y); + } // Wrapper functions for module: TestModule if (!importObject["TestModule"]) { importObject["TestModule"] = {}; @@ -650,11 +790,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_optionalName_set"] = function bjs_MyViewControllerDelegate_optionalName_set(self, valueIsSome, valueBytes, valueCount) { + TestModule["bjs_MyViewControllerDelegate_optionalName_set"] = function bjs_MyViewControllerDelegate_optionalName_set(self, valueIsSome, valueWord0, valueWord1, valueWord2) { try { let optResult; if (valueIsSome) { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); optResult = string; } else { optResult = null; @@ -672,11 +812,11 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_set"] = function bjs_MyViewControllerDelegate_optionalRawEnum_set(self, valueIsSome, valueBytes, valueCount) { + TestModule["bjs_MyViewControllerDelegate_optionalRawEnum_set"] = function bjs_MyViewControllerDelegate_optionalRawEnum_set(self, valueIsSome, valueWord0, valueWord1, valueWord2) { try { let optResult; if (valueIsSome) { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); optResult = string; } else { optResult = null; @@ -695,9 +835,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_rawStringEnum_set"] = function bjs_MyViewControllerDelegate_rawStringEnum_set(self, valueBytes, valueCount) { + TestModule["bjs_MyViewControllerDelegate_rawStringEnum_set"] = function bjs_MyViewControllerDelegate_rawStringEnum_set(self, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(self).rawStringEnum = string; } catch (error) { setException(error); @@ -818,9 +958,9 @@ export async function createInstantiator(options, swift) { setException(error); } } - TestModule["bjs_MyViewControllerDelegate_onValueChanged"] = function bjs_MyViewControllerDelegate_onValueChanged(self, valueBytes, valueCount) { + TestModule["bjs_MyViewControllerDelegate_onValueChanged"] = function bjs_MyViewControllerDelegate_onValueChanged(self, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(self).onValueChanged(string); } catch (error) { setException(error); @@ -835,10 +975,10 @@ export async function createInstantiator(options, swift) { return 0 } } - TestModule["bjs_MyViewControllerDelegate_onLabelUpdated"] = function bjs_MyViewControllerDelegate_onLabelUpdated(self, prefixBytes, prefixCount, suffixBytes, suffixCount) { + TestModule["bjs_MyViewControllerDelegate_onLabelUpdated"] = function bjs_MyViewControllerDelegate_onLabelUpdated(self, prefixWord0, prefixWord1, prefixWord2, suffixWord0, suffixWord1, suffixWord2) { try { - const string = decodeString(prefixBytes, prefixCount); - const string1 = decodeString(suffixBytes, suffixCount); + const string = decodeString(prefixWord0, prefixWord1, prefixWord2); + const string1 = decodeString(suffixWord0, suffixWord1, suffixWord2); swift.memory.getObject(self).onLabelUpdated(string, string1); } catch (error) { setException(error); @@ -911,12 +1051,197 @@ export async function createInstantiator(options, swift) { setException(error); } } + TestModule["bjs_MyViewControllerDelegate_validate"] = function bjs_MyViewControllerDelegate_validate(self, value) { + try { + let ret = swift.memory.getObject(self).validate(value); + return ret; + } catch (error) { + setException(error); + return 0 + } + } + TestModule["bjs_MyViewControllerDelegate_loadLabel"] = function bjs_MyViewControllerDelegate_loadLabel(resolveRef, rejectRef, self, keyWord0, keyWord1, keyWord2) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + const string = decodeString(keyWord0, keyWord1, keyWord2); + Promise.resolve(swift.memory.getObject(self).loadLabel(string)).then(resolve, reject); + } catch (error) { + reject(error); + } + } + TestModule["bjs_MyViewControllerDelegate_reset"] = function bjs_MyViewControllerDelegate_reset(resolveRef, rejectRef, self) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + Promise.resolve(swift.memory.getObject(self).reset()).then(resolve, reject); + } catch (error) { + reject(error); + } + } + TestModule["bjs_MyViewControllerDelegate_fetchCount"] = function bjs_MyViewControllerDelegate_fetchCount(resolveRef, rejectRef, self) { + const resolve = swift.memory.getObject(resolveRef); + const reject = swift.memory.getObject(rejectRef); + try { + Promise.resolve(swift.memory.getObject(self).fetchCount()).then(resolve, reject); + } catch (error) { + reject(error); + } + } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) @@ -1032,6 +1357,42 @@ export async function createInstantiator(options, swift) { sendHelper(helper) { instance.exports.bjs_MyViewController_sendHelper(this.pointer, helper.pointer); } + validateValue(value) { + const ret = instance.exports.bjs_MyViewController_validateValue(this.pointer, value); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + return ret; + } + loadLabel(key) { + const keyBytes = textEncoder.encode(key); + const keyId = swift.memory.retain(keyBytes); + const ret = instance.exports.bjs_MyViewController_loadLabel(this.pointer, keyId, keyBytes.length); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } + validatedDelegate() { + const ret = instance.exports.bjs_MyViewController_validatedDelegate(this.pointer); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); + return ret1; + } get delegate() { const ret = instance.exports.bjs_MyViewController_delegate_get(this.pointer); const ret1 = swift.memory.getObject(ret); diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js index eed26c581..c35d725e6 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ProtocolInClosure.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,7 +44,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -246,14 +249,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule10RenderableP_10RenderableP = function(param0) { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModule10RenderableP_10RenderableP(boxPtr, swift.memory.retain(param0)); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10RenderableP_10RenderableP); @@ -271,14 +274,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModule10RenderableP_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModule10RenderableP_SS = function(param0) { instance.exports.invoke_swift_closure_TestModule_10TestModule10RenderableP_SS(boxPtr, swift.memory.retain(param0)); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10RenderableP_SS); @@ -303,14 +306,14 @@ export async function createInstantiator(options, swift) { result = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10RenderableP_SS(boxPtr, +isSome, result); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10RenderableP_SS); @@ -328,14 +331,14 @@ export async function createInstantiator(options, swift) { bjs["make_swift_closure_TestModule_10TestModuley_10RenderableP"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuley_10RenderableP = function() { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuley_10RenderableP(boxPtr); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_10RenderableP); @@ -360,10 +363,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js index 2765d709f..87daa2d84 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/RelativeQualifiedTypes.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -82,8 +84,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -91,8 +93,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -117,8 +119,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -146,7 +148,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Library_Shelf"] = function(objectId) { @@ -221,11 +224,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -297,10 +300,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts new file mode 100644 index 000000000..82dc96f71 --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.d.ts @@ -0,0 +1,45 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export interface ReservedWordDelegate { + handle(_in: number, _for: string, _default: boolean): void; +} + +export interface BacktickedLabelDelegate { + handle(_in: number): void; +} + +/// Represents a Swift heap object like a class instance or an actor instance. +export interface SwiftHeapObject { + /// Release the heap object. + /// + /// Note: Calling this method will release the heap object and it will no longer be accessible. + release(): void; +} +export interface ReservedWordBox extends SwiftHeapObject { + run(_for: number): void; +} +export type Exports = { + check(extension: number, _break: number, _function: boolean, _in: string): void; + checkEscaped(_in: string): void; + checkEscapedCollision(_in: number, _in1: number): void; + checkGlueNameCollision(instance: number, swift: string): void; + ReservedWordBox: { + new(_in: number): ReservedWordBox; + make(_default: number): number; + }, +} +export type Imports = { + importedCheck(_in: number, _for: string, _default: boolean): void; + importedSelfClosure(self: () => void): void; +} +export function createInstantiator(options: { + imports: Imports; +}, swift: any): Promise<{ + addImports: (importObject: WebAssembly.Imports) => void; + setInstance: (instance: WebAssembly.Instance) => void; + createExports: (instance: WebAssembly.Instance) => Exports; +}>; \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.js new file mode 100644 index 000000000..deb145efa --- /dev/null +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ReservedWordParameters.js @@ -0,0 +1,555 @@ +// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit, +// DO NOT EDIT. +// +// To update this file, just rebuild your project or run +// `swift package bridge-js`. + +export async function createInstantiator(options, swift) { + let instance; + let memory; + let setException; + let decodeString; + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); + const textEncoder = new TextEncoder("utf-8"); + let tmpRetString; + let tmpRetBytes; + let tmpRetException; + let tmpRetOptionalBool; + let tmpRetOptionalInt; + let tmpRetOptionalFloat; + let tmpRetOptionalDouble; + let tmpRetOptionalHeapObject; + let strStack = []; + let i32Stack = []; + let i64Stack = []; + let f32Stack = []; + let f64Stack = []; + let ptrStack = []; + let taStack = []; + const enumHelpers = {}; + const structHelpers = {}; + + let _exports = null; + let bjs = null; + const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.unregistered) { return; } + instance?.exports?.bjs_release_swift_closure(state.pointer); + }); + const makeClosure = (pointer, file, line, func) => { + const state = { pointer, file, line, unregistered: false }; + const real = (...args) => { + if (state.unregistered) { + const bytes = new Uint8Array(memory.buffer, state.file >>> 0); + let length = 0; + while (bytes[length] !== 0) { length += 1; } + const fileID = decodeUTF8(state.file, length); + throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); + } + return func(...args); + }; + real.__unregister = () => { + if (state.unregistered) { return; } + state.unregistered = true; + swiftClosureRegistry.unregister(state); + }; + swiftClosureRegistry.register(real, state, state); + return swift.memory.retain(real); + }; + + + return { + /** + * @param {WebAssembly.Imports} importObject + */ + addImports: (importObject, importsContext) => { + bjs = {}; + importObject["bjs"] = bjs; + const imports = options.getImports(importsContext); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); + } + bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { + const source = swift.memory.getObject(sourceId); + swift.memory.release(sourceId); + const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); + bytes.set(source); + } + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); + } + bjs["swift_js_init_memory_with_result"] = function(ptr, len) { + const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); + target.set(tmpRetBytes); + tmpRetBytes = undefined; + } + bjs["swift_js_throw"] = function(id) { + tmpRetException = swift.memory.retainByRef(id); + } + bjs["swift_js_retain"] = function(id) { + return swift.memory.retainByRef(id); + } + bjs["swift_js_release"] = function(id) { + swift.memory.release(id); + } + bjs["swift_js_push_i32"] = function(v) { + i32Stack.push(v | 0); + } + bjs["swift_js_push_f32"] = function(v) { + f32Stack.push(Math.fround(v)); + } + bjs["swift_js_push_f64"] = function(v) { + f64Stack.push(v); + } + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); + strStack.push(value); + } + bjs["swift_js_pop_i32"] = function() { + return i32Stack.pop(); + } + bjs["swift_js_pop_f32"] = function() { + return f32Stack.pop(); + } + bjs["swift_js_pop_f64"] = function() { + return f64Stack.pop(); + } + bjs["swift_js_push_pointer"] = function(pointer) { + ptrStack.push(pointer); + } + bjs["swift_js_pop_pointer"] = function() { + return ptrStack.pop(); + } + bjs["swift_js_push_i64"] = function(v) { + i64Stack.push(v); + } + bjs["swift_js_pop_i64"] = function() { + return i64Stack.pop(); + } + const taCtors = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array]; + bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { + const Ctor = taCtors[kind]; + const byteLen = count * Ctor.BYTES_PER_ELEMENT; + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); + taStack.push(Array.from(new Ctor(copy))); + } + bjs["bjs_core_register_type_handles"] = function() {}; + const __bjs_promiseSettlers = Symbol("JavaScriptKit.promiseSettlers"); + bjs["swift_js_make_promise"] = function() { + let resolve, reject; + const promise = new Promise((res, rej) => { resolve = res; reject = rej; }); + promise[__bjs_promiseSettlers] = { resolve, reject }; + return swift.memory.retain(promise); + } + bjs["swift_js_return_optional_bool"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalBool = null; + } else { + tmpRetOptionalBool = value !== 0; + } + } + bjs["swift_js_return_optional_int"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalInt = null; + } else { + tmpRetOptionalInt = value | 0; + } + } + bjs["swift_js_return_optional_float"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalFloat = null; + } else { + tmpRetOptionalFloat = Math.fround(value); + } + } + bjs["swift_js_return_optional_double"] = function(isSome, value) { + if (isSome === 0) { + tmpRetOptionalDouble = null; + } else { + tmpRetOptionalDouble = value; + } + } + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = decodeString(word0, word1, word2); + } + } + bjs["swift_js_return_optional_object"] = function(isSome, objectId) { + if (isSome === 0) { + tmpRetString = null; + } else { + tmpRetString = swift.memory.getObject(objectId); + } + } + bjs["swift_js_return_optional_heap_object"] = function(isSome, pointer) { + if (isSome === 0) { + tmpRetOptionalHeapObject = null; + } else { + tmpRetOptionalHeapObject = pointer; + } + } + bjs["swift_js_get_optional_int_presence"] = function() { + return tmpRetOptionalInt != null ? 1 : 0; + } + bjs["swift_js_get_optional_int_value"] = function() { + const value = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; + return value; + } + bjs["swift_js_get_optional_string"] = function() { + const str = tmpRetString; + tmpRetString = undefined; + if (str == null) { + return -1; + } else { + const bytes = textEncoder.encode(str); + tmpRetBytes = bytes; + return bytes.length; + } + } + bjs["swift_js_get_optional_float_presence"] = function() { + return tmpRetOptionalFloat != null ? 1 : 0; + } + bjs["swift_js_get_optional_float_value"] = function() { + const value = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; + return value; + } + bjs["swift_js_get_optional_double_presence"] = function() { + return tmpRetOptionalDouble != null ? 1 : 0; + } + bjs["swift_js_get_optional_double_value"] = function() { + const value = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; + return value; + } + bjs["swift_js_get_optional_heap_object_pointer"] = function() { + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + return pointer || 0; + } + bjs["swift_js_closure_unregister"] = function(funcRef) {} + bjs["swift_js_closure_unregister"] = function(funcRef) { + const func = swift.memory.getObject(funcRef); + func.__unregister(); + } + bjs["invoke_js_callback_TestModule_10TestModuley_y"] = function(callbackId) { + try { + const callback = swift.memory.getObject(callbackId); + callback(); + } catch (error) { + setException(error); + } + } + bjs["make_swift_closure_TestModule_10TestModuley_y"] = function(boxPtr, file, line) { + const lower_closure_TestModule_10TestModuley_y = function() { + instance.exports.invoke_swift_closure_TestModule_10TestModuley_y(boxPtr); + if (tmpRetException) { + const error = swift.memory.getObject(tmpRetException); + swift.memory.release(tmpRetException); + tmpRetException = undefined; + throw error; + } + }; + return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuley_y); + } + // Wrapper functions for module: TestModule + if (!importObject["TestModule"]) { + importObject["TestModule"] = {}; + } + importObject["TestModule"]["bjs_ReservedWordBox_wrap"] = function(pointer) { + const obj = _exports['ReservedWordBox'].__construct(pointer); + return swift.memory.retain(obj); + }; + const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; + TestModule["bjs_importedCheck"] = function bjs_importedCheck(_in, forWord0, forWord1, forWord2, _default) { + try { + const string = decodeString(forWord0, forWord1, forWord2); + imports.importedCheck(_in, string, _default !== 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_importedSelfClosure"] = function bjs_importedSelfClosure(self) { + try { + imports.importedSelfClosure(swift.memory.getObject(self)); + } catch (error) { + setException(error); + } + } + TestModule["bjs_ReservedWordDelegate_handle"] = function bjs_ReservedWordDelegate_handle(self, _in, forWord0, forWord1, forWord2, _default) { + try { + const string = decodeString(forWord0, forWord1, forWord2); + swift.memory.getObject(self).handle(_in, string, _default !== 0); + } catch (error) { + setException(error); + } + } + TestModule["bjs_BacktickedLabelDelegate_handle"] = function bjs_BacktickedLabelDelegate_handle(self, _in) { + try { + swift.memory.getObject(self).handle(_in); + } catch (error) { + setException(error); + } + } + }, + setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); + instance = i; + memory = instance.exports.memory; + + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); + + setException = (error) => { + instance.exports._swift_js_exception.value = swift.memory.retain(error) + } + }, + /** @param {WebAssembly.Instance} instance */ + createExports: (instance) => { + const js = swift.memory.heap; + const swiftHeapObjectFinalizationRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { + if (state.hasReleased) { + return; + } + state.hasReleased = true; + state.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + }); + + /// Represents a Swift heap object like a class instance or an actor instance. + class SwiftHeapObject { + static __wrap(pointer, deinit, prototype, identityCache) { + pointer = pointer >>> 0; + const makeFresh = (identityMap) => { + const obj = Object.create(prototype); + const state = { pointer, deinit, hasReleased: false, identityMap }; + obj.pointer = pointer; + obj.__swiftHeapObjectState = state; + swiftHeapObjectFinalizationRegistry.register(obj, state, state); + if (identityMap) { + identityMap.set(pointer, new WeakRef(obj)); + } + return obj; + }; + + if (!identityCache) { + return makeFresh(null); + } + + const cached = identityCache.get(pointer)?.deref(); + if (cached && !cached.__swiftHeapObjectState.hasReleased) { + deinit(pointer); + return cached; + } + if (identityCache.has(pointer)) { + identityCache.delete(pointer); + } + + return makeFresh(identityCache); + } + + release() { + const state = this.__swiftHeapObjectState; + if (state.hasReleased) { + return; + } + state.hasReleased = true; + swiftHeapObjectFinalizationRegistry.unregister(state); + state.identityMap?.delete(state.pointer); + state.deinit(state.pointer); + } + } + class ReservedWordBox extends SwiftHeapObject { + static __construct(ptr) { + return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_ReservedWordBox_deinit, ReservedWordBox.prototype, null); + } + + constructor(_in) { + const ret = instance.exports.bjs_ReservedWordBox_init(_in); + return ReservedWordBox.__construct(ret); + } + run(_for) { + instance.exports.bjs_ReservedWordBox_run(this.pointer, _for); + } + static make(_default) { + const ret = instance.exports.bjs_ReservedWordBox_static_make(_default); + return ret; + } + } + const exports = { + check: function bjs_check(extension, _break, _function, _in) { + const _inBytes = textEncoder.encode(_in); + const _inId = swift.memory.retain(_inBytes); + instance.exports.bjs_check(extension, _break, _function, _inId, _inBytes.length); + }, + checkEscaped: function bjs_checkEscaped(_in) { + const _inBytes = textEncoder.encode(_in); + const _inId = swift.memory.retain(_inBytes); + instance.exports.bjs_checkEscaped(_inId, _inBytes.length); + }, + checkEscapedCollision: function bjs_checkEscapedCollision(_in, _in1) { + instance.exports.bjs_checkEscapedCollision(_in, _in1); + }, + checkGlueNameCollision: function bjs_checkGlueNameCollision(instance1, swift1) { + const swift1Bytes = textEncoder.encode(swift1); + const swift1Id = swift.memory.retain(swift1Bytes); + instance.exports.bjs_checkGlueNameCollision(instance1, swift1Id, swift1Bytes.length); + }, + ReservedWordBox, + }; + _exports = exports; + return exports; + }, + } +} \ No newline at end of file diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js index f46f42d10..a5f1258e4 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.Global.js @@ -20,7 +20,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -83,8 +85,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -92,8 +94,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -118,8 +120,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -147,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -187,11 +190,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -259,10 +262,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js index 37d3415a4..e52f9d5dd 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticFunctions.js @@ -20,7 +20,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -83,8 +85,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -92,8 +94,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -118,8 +120,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -147,7 +149,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -187,11 +190,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -259,10 +262,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js index e2a9093b6..94888662f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.Global.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -44,8 +46,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -53,8 +55,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -79,8 +81,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -108,7 +110,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -148,11 +151,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -220,10 +223,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js index f442745e5..84fb321ae 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StaticProperties.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -44,8 +46,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -53,8 +55,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -79,8 +81,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -108,7 +110,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -148,11 +151,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -220,10 +223,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js index ebddbefd2..78f6a8dbc 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringParameter.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -206,17 +209,17 @@ export async function createInstantiator(options, swift) { } bjs["swift_js_closure_unregister"] = function(funcRef) {} const TestModule = importObject["TestModule"] = importObject["TestModule"] || {}; - TestModule["bjs_checkString"] = function bjs_checkString(aBytes, aCount) { + TestModule["bjs_checkString"] = function bjs_checkString(aWord0, aWord1, aWord2) { try { - const string = decodeString(aBytes, aCount); + const string = decodeString(aWord0, aWord1, aWord2); imports.checkString(string); } catch (error) { setException(error); } } - TestModule["bjs_checkStringWithLength"] = function bjs_checkStringWithLength(aBytes, aCount, b) { + TestModule["bjs_checkStringWithLength"] = function bjs_checkStringWithLength(aWord0, aWord1, aWord2, b) { try { - const string = decodeString(aBytes, aCount); + const string = decodeString(aWord0, aWord1, aWord2); imports.checkStringWithLength(string, b); } catch (error) { setException(error); @@ -224,10 +227,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js index d2dfa204f..0a8460da0 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StringReturn.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -217,10 +220,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js index 9104e2084..c5e8ebe24 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/StructWithNestedTypes.js @@ -24,7 +24,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -98,8 +100,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -107,8 +109,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -133,8 +135,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -162,7 +164,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Shape"] = function(objectId) { @@ -230,11 +233,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -294,10 +297,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js index 92ef435fb..fc6903739 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -242,10 +245,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js index 279a9d3c6..ece62f6ac 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosure.js @@ -39,7 +39,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -289,7 +291,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -383,6 +385,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -395,7 +404,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -501,8 +510,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -510,8 +519,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -536,8 +545,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -565,7 +574,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Animal"] = function(objectId) { @@ -584,9 +594,9 @@ export async function createInstantiator(options, swift) { promise[__bjs_promiseSettlers] = { resolve, reject }; return swift.memory.retain(promise); } - bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) { + bjs["promise_resolve_TestModule_SS"] = function(promise, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); } catch (error) { setException(error); @@ -644,11 +654,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -733,10 +743,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule10HttpStatusO_10HttpStatusO); } - bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModule5ThemeO_5ThemeO"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); let ret = callback(string); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -749,14 +759,14 @@ export async function createInstantiator(options, swift) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); instance.exports.invoke_swift_closure_TestModule_10TestModule5ThemeO_5ThemeO(boxPtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule5ThemeO_5ThemeO); @@ -775,13 +785,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModule6AnimalV_6AnimalV = function(param0) { structHelpers.M10TestModuleT6Animal.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule6AnimalV_6AnimalV(boxPtr); - const structValue = structHelpers.M10TestModuleT6Animal.lift(); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const structValue = structHelpers.M10TestModuleT6Animal.lift(); return structValue; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule6AnimalV_6AnimalV); @@ -824,13 +834,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModule9APIResultO_9APIResultO = function(param0) { const param0CaseId = enumHelpers.M10TestModuleT9APIResult.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModule9APIResultO_9APIResultO(boxPtr, param0CaseId); - const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop()); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = enumHelpers.M10TestModuleT9APIResult.lift(i32Stack.pop()); return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9APIResultO_9APIResultO); @@ -858,10 +868,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModule9DirectionO_9DirectionO); } - bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); let ret = callback(string); return ret ? 1 : 0; } catch (error) { @@ -884,10 +894,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleKSS_Sb); } - bjs["invoke_js_callback_TestModule_10TestModuleKSS_Si"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleKSS_Si"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); let ret = callback(string); return ret; } catch (error) { @@ -910,10 +920,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleKSS_Si); } - bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleSS_SS"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); let ret = callback(string); tmpRetBytes = textEncoder.encode(ret); return tmpRetBytes.length; @@ -926,14 +936,14 @@ export async function createInstantiator(options, swift) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); instance.exports.invoke_swift_closure_TestModule_10TestModuleSS_SS(boxPtr, param0Id, param0Bytes.length); - const ret = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret = tmpRetString; + tmpRetString = undefined; return ret; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSS_SS); @@ -1044,24 +1054,24 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO(boxPtr, +isSome, isSome ? param0 : 0); - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq10HttpStatusO_Sq10HttpStatusO); } - bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO"] = function(callbackId, param0IsSome, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); let optResult; if (param0IsSome) { - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); optResult = string; } else { optResult = null; @@ -1087,14 +1097,14 @@ export async function createInstantiator(options, swift) { result1 = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO(boxPtr, +isSome, result, result1); - const optResult = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetString; + tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq5ThemeO_Sq5ThemeO); @@ -1113,13 +1123,13 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV = function(param0) { __bjs_codec_Optional_M10TestModuleT6Animal.lower(param0); instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV(boxPtr); - const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift(); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optValue = __bjs_codec_Optional_M10TestModuleT6Animal.lift(); return optValue; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6AnimalV_Sq6AnimalV); @@ -1144,15 +1154,15 @@ export async function createInstantiator(options, swift) { result = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC(boxPtr, +isSome, result); - const pointer = tmpRetOptionalHeapObject; - tmpRetOptionalHeapObject = undefined; - const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const pointer = tmpRetOptionalHeapObject; + tmpRetOptionalHeapObject = undefined; + const optResult = pointer === null ? null : _exports['Person'].__construct(pointer); return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq6PersonC_Sq6PersonC); @@ -1190,14 +1200,14 @@ export async function createInstantiator(options, swift) { result = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO(boxPtr, +isSome, result); - const tag = i32Stack.pop(); - const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const tag = i32Stack.pop(); + const optResult = tag === -1 ? null : enumHelpers.M10TestModuleT9APIResult.lift(tag); return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9APIResultO_Sq9APIResultO); @@ -1216,24 +1226,24 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO(boxPtr, +isSome, isSome ? param0 : 0); - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSq9DirectionO_Sq9DirectionO); } - bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleSqSS_SqSS"] = function(callbackId, param0IsSome, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); let optResult; if (param0IsSome) { - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); optResult = string; } else { optResult = null; @@ -1259,14 +1269,14 @@ export async function createInstantiator(options, swift) { result1 = 0; } instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSS_SqSS(boxPtr, +isSome, result, result1); - const optResult = tmpRetString; - tmpRetString = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetString; + tmpRetString = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSS_SqSS); @@ -1285,14 +1295,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSb_SqSb = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSb_SqSb(boxPtr, +isSome, isSome ? param0 ? 1 : 0 : 0); - const optResult = tmpRetOptionalBool; - tmpRetOptionalBool = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalBool; + tmpRetOptionalBool = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSb_SqSb); @@ -1311,14 +1321,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSd_SqSd = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSd_SqSd(boxPtr, +isSome, isSome ? param0 : 0.0); - const optResult = tmpRetOptionalDouble; - tmpRetOptionalDouble = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalDouble; + tmpRetOptionalDouble = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSd_SqSd); @@ -1337,14 +1347,14 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSf_SqSf = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSf_SqSf(boxPtr, +isSome, isSome ? param0 : 0.0); - const optResult = tmpRetOptionalFloat; - tmpRetOptionalFloat = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalFloat; + tmpRetOptionalFloat = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSf_SqSf); @@ -1363,38 +1373,42 @@ export async function createInstantiator(options, swift) { const lower_closure_TestModule_10TestModuleSqSi_SqSi = function(param0) { const isSome = param0 != null; instance.exports.invoke_swift_closure_TestModule_10TestModuleSqSi_SqSi(boxPtr, +isSome, isSome ? param0 : 0); - const optResult = tmpRetOptionalInt; - tmpRetOptionalInt = undefined; if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const optResult = tmpRetOptionalInt; + tmpRetOptionalInt = undefined; return optResult; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSqSi_SqSi); } - bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS); @@ -1402,30 +1416,38 @@ export async function createInstantiator(options, swift) { bjs["invoke_js_callback_TestModule_10TestModuleYaKSb_9APIResultO"] = function(resolveRef, rejectRef, callbackId, param0) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - callback(param0 !== 0).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + Promise.resolve(callback(param0 !== 0)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSb_9APIResultO = function(param0) { const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSb_9APIResultO(boxPtr, param0); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSb_9APIResultO); } - bjs["invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleYaSS_6AnimalV"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaSS_6AnimalV"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaSS_6AnimalV = function(param0) { @@ -1438,12 +1460,16 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaSS_6AnimalV); } - bjs["invoke_js_callback_TestModule_10TestModuleYaSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleYaSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaSS_SS = function(param0) { @@ -1522,10 +1548,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules9APIResultO_y); } - bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); callback(string); } catch (error) { setException(error); @@ -1559,10 +1585,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js index 96c78dd22..eb2347864 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClosureImports.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -119,6 +121,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const swiftClosureRegistry = (typeof FinalizationRegistry === "undefined") ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((state) => { if (state.unregistered) { return; } @@ -131,7 +140,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -154,8 +163,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -163,8 +172,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -189,8 +198,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -218,7 +227,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -229,9 +239,9 @@ export async function createInstantiator(options, swift) { promise[__bjs_promiseSettlers] = { resolve, reject }; return swift.memory.retain(promise); } - bjs["promise_resolve_TestModule_SS"] = function(promise, valueBytes, valueCount) { + bjs["promise_resolve_TestModule_SS"] = function(promise, valueWord0, valueWord1, valueWord2) { try { - const string = decodeString(valueBytes, valueCount); + const string = decodeString(valueWord0, valueWord1, valueWord2); swift.memory.getObject(promise)[__bjs_promiseSettlers].resolve(string); } catch (error) { setException(error); @@ -273,11 +283,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -339,10 +349,10 @@ export async function createInstantiator(options, swift) { const func = swift.memory.getObject(funcRef); func.__unregister(); } - bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleKSS_Sb"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); let ret = callback(string); return ret ? 1 : 0; } catch (error) { @@ -388,26 +398,30 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleSi_Si); } - bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModuleYaKSS_SS"] = function(resolveRef, rejectRef, callbackId, param0Word0, param0Word1, param0Word2) { const resolve = swift.memory.getObject(resolveRef); const reject = swift.memory.getObject(rejectRef); - const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); - callback(string).then(resolve, reject); + try { + const callback = swift.memory.getObject(callbackId); + const string = decodeString(param0Word0, param0Word1, param0Word2); + Promise.resolve(callback(string)).then(resolve, reject); + } catch (error) { + reject(error); + } } bjs["make_swift_closure_TestModule_10TestModuleYaKSS_SS"] = function(boxPtr, file, line) { const lower_closure_TestModule_10TestModuleYaKSS_SS = function(param0) { const param0Bytes = textEncoder.encode(param0); const param0Id = swift.memory.retain(param0Bytes); const ret = instance.exports.invoke_swift_closure_TestModule_10TestModuleYaKSS_SS(boxPtr, param0Id, param0Bytes.length); - const ret1 = swift.memory.getObject(ret); - swift.memory.release(ret); if (tmpRetException) { const error = swift.memory.getObject(tmpRetException); swift.memory.release(tmpRetException); tmpRetException = undefined; throw error; } + const ret1 = swift.memory.getObject(ret); + swift.memory.release(ret); return ret1; }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModuleYaKSS_SS); @@ -434,10 +448,10 @@ export async function createInstantiator(options, swift) { }; return makeClosure(boxPtr, file, line, lower_closure_TestModule_10TestModules7JSValueV_y); } - bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Bytes, param0Count) { + bjs["invoke_js_callback_TestModule_10TestModulesSS_y"] = function(callbackId, param0Word0, param0Word1, param0Word2) { try { const callback = swift.memory.getObject(callbackId); - const string = decodeString(param0Bytes, param0Count); + const string = decodeString(param0Word0, param0Word1, param0Word2); callback(string); } catch (error) { setException(error); @@ -481,10 +495,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts index 3b394fb06..48590c063 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts @@ -49,6 +49,7 @@ export interface Vector2D { magnitude(): number; scaled(factor: number): Vector2D; describe(): string; + dot(components: number[]): number; } export type PrecisionObject = typeof PrecisionValues; diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js index fc3d9ddbb..7ba2ada2f 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js @@ -14,7 +14,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -264,7 +266,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -358,6 +360,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_Optional_Int = __bjs_optionalCodec(__bjs_primitiveCodecs.Int); const __bjs_codec_Optional_Bool = __bjs_optionalCodec(__bjs_primitiveCodecs.Bool); @@ -385,6 +394,7 @@ export async function createInstantiator(options, swift) { }, }; const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject); + const __bjs_codec_Array_Double = __bjs_arrayCodec(__bjs_primitiveCodecs.Double); const __bjs_createStructHelpers_M10TestModuleT9DataPoint = () => ({ lower: (value) => { @@ -515,16 +525,22 @@ export async function createInstantiator(options, swift) { }.bind(instance1); instance1.scaled = function(factor) { structHelpers.M10TestModuleT8Vector2D.lower(this); - const ret1 = instance.exports.bjs_Vector2D_scaled(factor); + instance.exports.bjs_Vector2D_scaled(factor); const structValue = structHelpers.M10TestModuleT8Vector2D.lift(); return structValue; }.bind(instance1); instance1.describe = function() { structHelpers.M10TestModuleT8Vector2D.lower(this); - const ret2 = instance.exports.bjs_Vector2D_describe(); - const ret3 = tmpRetString; + instance.exports.bjs_Vector2D_describe(); + const ret = tmpRetString; tmpRetString = undefined; - return ret3; + return ret; + }.bind(instance1); + instance1.dot = function(components) { + structHelpers.M10TestModuleT8Vector2D.lower(this); + __bjs_codec_Array_Double.lower(components); + const ret = instance.exports.bjs_Vector2D_dot(); + return ret; }.bind(instance1); return instance1; } @@ -537,8 +553,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -546,8 +562,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -572,8 +588,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -601,7 +617,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_DataPoint"] = function(objectId) { @@ -697,11 +714,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -769,10 +786,158 @@ export async function createInstantiator(options, swift) { }; }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js index 134d7c28e..c1bb5d023 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStructImports.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -259,7 +261,7 @@ export async function createInstantiator(options, swift) { const jsValuePayload2 = f64Stack.pop(); const jsValuePayload1 = i32Stack.pop(); const jsValueKind = i32Stack.pop(); - const jsValue = __bjs_jsValueLift(jsValueKind, jsValuePayload1, jsValuePayload2); + const jsValue = __bjs_jsValueTake(jsValueKind, jsValuePayload1, jsValuePayload2); return jsValue; }, }, @@ -353,6 +355,13 @@ export async function createInstantiator(options, swift) { } return jsValue; } + function __bjs_jsValueTake(kind, payload1, payload2) { + const value = __bjs_jsValueLift(kind, payload1, payload2); + if (kind === 1 || kind === 3 || kind === 7 || kind === 8) { + swift.memory.release(payload1); + } + return value; + } const __bjs_codec_M10TestModuleT5Point = { lower: (v) => { @@ -385,8 +394,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -394,8 +403,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -420,8 +429,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -449,7 +458,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_Point"] = function(objectId) { @@ -496,11 +506,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -579,10 +589,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js index 500a005a3..1abc20336 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftTypedClosureAccess.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -42,7 +44,7 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, state.file >>> 0); let length = 0; while (bytes[length] !== 0) { length += 1; } - const fileID = decodeString(state.file, length); + const fileID = decodeUTF8(state.file, length); throw new Error(`Attempted to call a released JSTypedClosure created at ${fileID}:${state.line}`); } return func(...args); @@ -64,8 +66,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -73,8 +75,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -99,8 +101,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -128,7 +130,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -324,10 +327,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js index 58ff6a85a..3b36bb511 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Throws.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -39,8 +41,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -48,8 +50,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -74,8 +76,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -103,7 +105,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -142,11 +145,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -206,10 +209,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js index 416e5c281..f3d2a217a 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/UnsafePointer.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -56,8 +58,8 @@ export async function createInstantiator(options, swift) { addImports: (importObject, importsContext) => { bjs = {}; importObject["bjs"] = bjs; - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -65,8 +67,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -91,8 +93,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -120,7 +122,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["swift_js_struct_lower_PointerFields"] = function(objectId) { @@ -167,11 +170,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -231,10 +234,158 @@ export async function createInstantiator(options, swift) { bjs["swift_js_closure_unregister"] = function(funcRef) {} }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js index 81b09eaf4..c8693eeb3 100644 --- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js +++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/VoidParameterVoidReturn.js @@ -9,7 +9,9 @@ export async function createInstantiator(options, swift) { let memory; let setException; let decodeString; - const textDecoder = new TextDecoder("utf-8"); + let decodeUTF8; + const immortalStrings = new Map(); + const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }); const textEncoder = new TextEncoder("utf-8"); let tmpRetString; let tmpRetBytes; @@ -40,8 +42,8 @@ export async function createInstantiator(options, swift) { bjs = {}; importObject["bjs"] = bjs; const imports = options.getImports(importsContext); - bjs["swift_js_return_string"] = function(ptr, len) { - tmpRetString = decodeString(ptr, len); + bjs["swift_js_return_string"] = function(word0, word1, word2) { + tmpRetString = decodeString(word0, word1, word2); } bjs["swift_js_init_memory"] = function(sourceId, bytesPtr) { const source = swift.memory.getObject(sourceId); @@ -49,8 +51,8 @@ export async function createInstantiator(options, swift) { const bytes = new Uint8Array(memory.buffer, bytesPtr >>> 0); bytes.set(source); } - bjs["swift_js_make_js_string"] = function(ptr, len) { - return swift.memory.retain(decodeString(ptr, len)); + bjs["swift_js_make_js_string"] = function(word0, word1, word2) { + return swift.memory.retain(decodeString(word0, word1, word2)); } bjs["swift_js_init_memory_with_result"] = function(ptr, len) { const target = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); @@ -75,8 +77,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_f64"] = function(v) { f64Stack.push(v); } - bjs["swift_js_push_string"] = function(ptr, len) { - const value = decodeString(ptr, len); + bjs["swift_js_push_string"] = function(word0, word1, word2) { + const value = decodeString(word0, word1, word2); strStack.push(value); } bjs["swift_js_pop_i32"] = function() { @@ -104,7 +106,8 @@ export async function createInstantiator(options, swift) { bjs["swift_js_push_typed_array"] = function(kind, ptr, count) { const Ctor = taCtors[kind]; const byteLen = count * Ctor.BYTES_PER_ELEMENT; - const copy = memory.buffer.slice(ptr, ptr + byteLen); + const start = ptr >>> 0; + const copy = memory.buffer.slice(start, start + byteLen); taStack.push(Array.from(new Ctor(copy))); } bjs["bjs_core_register_type_handles"] = function() {}; @@ -143,11 +146,11 @@ export async function createInstantiator(options, swift) { tmpRetOptionalDouble = value; } } - bjs["swift_js_return_optional_string"] = function(isSome, ptr, len) { + bjs["swift_js_return_optional_string"] = function(isSome, word0, word1, word2) { if (isSome === 0) { tmpRetString = null; } else { - tmpRetString = decodeString(ptr, len); + tmpRetString = decodeString(word0, word1, word2); } } bjs["swift_js_return_optional_object"] = function(isSome, objectId) { @@ -215,10 +218,158 @@ export async function createInstantiator(options, swift) { } }, setInstance: (i) => { + if (memory !== i.exports.memory) immortalStrings.clear(); instance = i; memory = instance.exports.memory; - decodeString = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeUTF8 = (ptr, len) => { const bytes = new Uint8Array(memory.buffer, ptr >>> 0, len >>> 0); return textDecoder.decode(bytes); } + decodeString = (() => { + const byteAt = (word0, word1, byteIndex) => + byteIndex < 4 + ? (word0 >>> (byteIndex * 8)) & 255 + : (word1 >>> ((byteIndex - 4) * 8)) & 255; + // Valid small Swift strings need at most eight UTF-16 code units. + const decodeSmallUTF8 = (word0, word1, count) => { + if (count > 8) { + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + let byteIndex = 0, + unitCount = 0, + u0 = 0, + u1 = 0, + u2 = 0, + u3 = 0, + u4 = 0, + u5 = 0, + u6 = 0, + u7 = 0; + while (byteIndex < count) { + const b0 = byteAt(word0, word1, byteIndex++); + let codePoint; + if (b0 < 128) codePoint = b0; + else if (b0 < 224) codePoint = ((b0 & 31) << 6) | (byteAt(word0, word1, byteIndex++) & 63); + else if (b0 < 240) { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 15) << 12) | ((b1 & 63) << 6) | (b2 & 63); + } else { + const b1 = byteAt(word0, word1, byteIndex++), + b2 = byteAt(word0, word1, byteIndex++), + b3 = byteAt(word0, word1, byteIndex++); + codePoint = ((b0 & 7) << 18) | ((b1 & 63) << 12) | ((b2 & 63) << 6) | (b3 & 63); + } + const supplementary = codePoint > 0xffff; + const codeUnit = supplementary + ? 0xd800 + ((codePoint - 0x10000) >>> 10) + : codePoint; + switch (unitCount++) { + case 0: + u0 = codeUnit; + break; + case 1: + u1 = codeUnit; + break; + case 2: + u2 = codeUnit; + break; + case 3: + u3 = codeUnit; + break; + case 4: + u4 = codeUnit; + break; + case 5: + u5 = codeUnit; + break; + case 6: + u6 = codeUnit; + break; + case 7: + u7 = codeUnit; + break; + } + if (supplementary) { + const lowSurrogate = 0xdc00 + ((codePoint - 0x10000) & 1023); + switch (unitCount++) { + case 0: + u0 = lowSurrogate; + break; + case 1: + u1 = lowSurrogate; + break; + case 2: + u2 = lowSurrogate; + break; + case 3: + u3 = lowSurrogate; + break; + case 4: + u4 = lowSurrogate; + break; + case 5: + u5 = lowSurrogate; + break; + case 6: + u6 = lowSurrogate; + break; + case 7: + u7 = lowSurrogate; + break; + } + } + } + switch (unitCount) { + case 0: + return ""; + case 1: + return String.fromCharCode(u0); + case 2: + return String.fromCharCode(u0, u1); + case 3: + return String.fromCharCode(u0, u1, u2); + case 4: + return String.fromCharCode(u0, u1, u2, u3); + case 5: + return String.fromCharCode(u0, u1, u2, u3, u4); + case 6: + return String.fromCharCode(u0, u1, u2, u3, u4, u5); + case 7: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6); + case 8: + return String.fromCharCode(u0, u1, u2, u3, u4, u5, u6, u7); + } + }; + const decodeSmall = (word0, word1, word2) => { + const count = (word2 >>> 8) & 0x0f; + if ((word2 & 0x4000 /* ASCII */) === 0) return decodeSmallUTF8(word0, word1, count); + const char = String.fromCharCode; + switch (count) { + case 0: return ""; + case 1: return char(word0 & 0xff); + case 2: return char(word0 & 0xff, (word0 >>> 8) & 0xff); + case 3: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff); + case 4: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24); + case 5: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff); + case 6: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff); + case 7: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff); + case 8: return char(word0 & 0xff, (word0 >>> 8) & 0xff, (word0 >>> 16) & 0xff, word0 >>> 24, word1 & 0xff, (word1 >>> 8) & 0xff, (word1 >>> 16) & 0xff, word1 >>> 24); + default: + throw new Error(`Unsupported Swift inline String length: ${count} UTF-8 bytes (maximum 8). The Swift String layout may have changed; update JavaScriptKit and regenerate BridgeJS glue.`); + } + }; + return (word0, word1, word2) => { + if (word2 & 0x2000 /* small */) return decodeSmall(word0, word1, word2); + const ptr = (word1 + 20 /* nativeBias */) >>> 0; + const len = word0 >>> 0; + if ((word2 & 0x8000 /* immortal */) === 0 || len >= 0x200000 /* 2^21 Number key */) return decodeUTF8(ptr, len); + const key = ptr + len * 0x100000000; + const cached = immortalStrings.get(key); + if (cached !== undefined) return cached; + const value = decodeUTF8(ptr, len); + immortalStrings.set(key, value); + return value; + }; + })(); setException = (error) => { instance.exports._swift_js_exception.value = swift.memory.retain(error) diff --git a/Plugins/PackageToJS/README.md b/Plugins/PackageToJS/README.md index cbcaf19c5..01a420466 100644 --- a/Plugins/PackageToJS/README.md +++ b/Plugins/PackageToJS/README.md @@ -11,6 +11,26 @@ PackageToJS is a command plugin for Swift Package Manager that simplifies the pr - Build WebAssembly file and generate JavaScript wrappers - Test driver for Swift Testing and XCTest - Generated JS files can be consumed by JS bundler tools like Vite +- Select `@bjorn3/browser_wasi_shim` or `uwasi` for generated WASI packages + +## WASI Runtime + +PackageToJS uses `@bjorn3/browser_wasi_shim` by default. Pass `--wasi-runtime uwasi` +to generate browser and Node platform wrappers backed by `uwasi` instead: + +```bash +swift package --swift-sdk wasm32-unknown-wasi js --wasi-runtime uwasi +``` + +The `uwasi` wrappers import only the stdio, args, environ, clock, poll, proc and +random features, so bundlers can drop `uwasi`'s file system and file syscalls return +`ENOSYS`. With `--enable-code-coverage`, the Node wrapper adds an in-memory file +system so the test runner can read the coverage profile. To give an application a +file system, pass your own `wasi` object to `instantiate`. + +The generated browser main-thread setup rejects blocking WASI waits. Run guests that +require `poll_oneoff` clock waits in a worker. Node and browser workers use `uwasi`'s +blocking implementation. ## Requirements @@ -42,4 +62,3 @@ Please define the following environment variables when you want to run E2E tests - `SWIFT_SDK_ID`: Specifies the Swift SDK identifier to use - `SWIFT_BIN_PATH`: Specifies the `bin` path to the Swift toolchain to use - diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift index c8adb9346..b736cca69 100644 --- a/Plugins/PackageToJS/Sources/PackageToJS.swift +++ b/Plugins/PackageToJS/Sources/PackageToJS.swift @@ -10,6 +10,11 @@ struct PackageToJS { case node } + enum WASIRuntime: String, CaseIterable { + case browserWASIShim = "browser-wasi-shim" + case uwasi + } + /// Path to the output directory var outputPath: String? /// The build configuration to use (default: debug) @@ -18,6 +23,8 @@ struct PackageToJS { var packageName: String? /// Target platform for the generated JavaScript (default: browser) var defaultPlatform: Platform = .browser + /// WASI runtime used by generated JavaScript (default: browser-wasi-shim) + var wasiRuntime: WASIRuntime = .browserWASIShim /// Whether to explain the build plan (default: false) var explain: Bool = false /// Whether to print verbose output @@ -625,7 +632,7 @@ struct PackagingPlanner { } // Copy the template files - for (file, output) in [ + var templateFiles = [ ("Plugins/PackageToJS/Templates/index.js", "index.js"), ("Plugins/PackageToJS/Templates/index.d.ts", "index.d.ts"), ("Plugins/PackageToJS/Templates/instantiate.js", "instantiate.js"), @@ -637,7 +644,13 @@ struct PackagingPlanner { ("Plugins/PackageToJS/Templates/platforms/node.d.ts", "platforms/node.d.ts"), ("Sources/JavaScriptKit/Runtime/index.mjs", "runtime.js"), ("Sources/JavaScriptKit/Runtime/index.d.ts", "runtime.d.ts"), - ] { + ] + if options.wasiRuntime == .uwasi { + templateFiles.append( + ("Plugins/PackageToJS/Templates/platforms/uwasi.js", "platforms/uwasi.js") + ) + } + for (file, output) in templateFiles { packageInputs.append( planCopyTemplateFile( make: &make, @@ -943,6 +956,8 @@ struct PackagingPlanner { // this task instead, so a change in them still re-runs the preprocessing. let staticConditions: [String: Bool] = [ "USE_WASI_CDN": options.useCDN, + "USE_UWASI": options.wasiRuntime == .uwasi, + "USE_UWASI_FILESYSTEM": options.wasiRuntime == .uwasi && options.enableCodeCoverage, "HAS_BRIDGE": skeletons.count > 0, "HAS_IMPORTS": skeletons.count > 0, "TARGET_DEFAULT_PLATFORM_NODE": options.defaultPlatform == .node, diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift index 560b3e980..5ee298624 100644 --- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift +++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift @@ -599,6 +599,19 @@ extension ArgumentExtractor { } return platform } + + mutating func extractWASIRuntimeOption(named name: String) throws -> PackageToJS.PackageOptions.WASIRuntime { + guard let stringValue = self.extractOption(named: name).last else { + return .browserWASIShim + } + + guard let runtime = PackageToJS.PackageOptions.WASIRuntime(rawValue: stringValue) else { + throw PackageToJSError( + "Invalid WASI runtime: \(stringValue), expected one of \(PackageToJS.PackageOptions.WASIRuntime.allCases.map(\.rawValue).joined(separator: ", "))" + ) + } + return runtime + } } extension PackageToJS.PackageOptions { @@ -608,6 +621,7 @@ extension PackageToJS.PackageOptions { (extractor.extractOption(named: "configuration") + extractor.extractSingleDashOption(named: "c")).last let packageName = extractor.extractOption(named: "package-name").last let defaultPlatform = try extractor.extractPlatformOption(named: "default-platform") + let wasiRuntime = try extractor.extractWASIRuntimeOption(named: "wasi-runtime") let explain = extractor.extractFlag(named: "explain") let useCDN = extractor.extractFlag(named: "use-cdn") let verbose = extractor.extractFlag(named: "verbose") @@ -617,6 +631,7 @@ extension PackageToJS.PackageOptions { configuration: configuration, packageName: packageName, defaultPlatform: defaultPlatform, + wasiRuntime: wasiRuntime, explain: explain != 0, verbose: verbose != 0, useCDN: useCDN != 0, @@ -629,7 +644,8 @@ extension PackageToJS.PackageOptions { --output Path to the output directory (default: .build/plugins/PackageToJS/outputs/Package) -c, --configuration The build configuration to use (values: debug, release; default: debug) --package-name Name of the package (default: lowercased Package.swift name) - --platform Target platform for generated JavaScript (values: \(PackageToJS.PackageOptions.Platform.allCases.map(\.rawValue).joined(separator: ", ")); default: \(PackageToJS.PackageOptions.Platform.browser)) + --default-platform Target platform for generated JavaScript (values: \(PackageToJS.PackageOptions.Platform.allCases.map(\.rawValue).joined(separator: ", ")); default: \(PackageToJS.PackageOptions.Platform.browser)) + --wasi-runtime WASI runtime for generated JavaScript (values: \(PackageToJS.PackageOptions.WASIRuntime.allCases.map(\.rawValue).joined(separator: ", ")); default: \(PackageToJS.PackageOptions.WASIRuntime.browserWASIShim.rawValue)) --use-cdn Whether to use CDN for dependency packages --enable-code-coverage Whether to enable code coverage collection --explain Whether to explain the build plan diff --git a/Plugins/PackageToJS/Templates/package.json b/Plugins/PackageToJS/Templates/package.json index a3e7074bb..482b7fe9d 100644 --- a/Plugins/PackageToJS/Templates/package.json +++ b/Plugins/PackageToJS/Templates/package.json @@ -8,6 +8,10 @@ "./wasm": "./@PACKAGE_TO_JS_MODULE_PATH@" }, "dependencies": { +/* #if USE_UWASI */ + "uwasi": "1.5.2" +/* #else */ "@bjorn3/browser_wasi_shim": "0.3.0" +/* #endif */ } } diff --git a/Plugins/PackageToJS/Templates/platforms/browser.js b/Plugins/PackageToJS/Templates/platforms/browser.js index d471e8415..6b148685f 100644 --- a/Plugins/PackageToJS/Templates/platforms/browser.js +++ b/Plugins/PackageToJS/Templates/platforms/browser.js @@ -1,6 +1,16 @@ // @ts-check import { MODULE_PATH /* #if USE_SHARED_MEMORY */, MEMORY_TYPE /* #endif */} from "../instantiate.js" /* #if IS_WASI */ +/* #if USE_UWASI */ +/* #if USE_WASI_CDN */ +// @ts-ignore +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'https://cdn.jsdelivr.net/npm/uwasi@1.5.2/+esm'; +/* #else */ +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'uwasi'; +/* #endif */ +import { browserMainThreadSleep, createUwasi } from './uwasi.js'; +const uwasiRuntime = { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom }; +/* #else */ /* #if USE_WASI_CDN */ // @ts-ignore import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory } from 'https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.4.1/+esm'; @@ -9,6 +19,7 @@ import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory } from 'https://c import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory } from '@bjorn3/browser_wasi_shim'; /* #endif */ /* #endif */ +/* #endif */ /* #if USE_SHARED_MEMORY */ export async function defaultBrowserThreadSetup() { @@ -27,6 +38,9 @@ export async function defaultBrowserThreadSetup() { } /* #if IS_WASI */ +/* #if USE_UWASI */ + const { wasi } = createUwasi(uwasiRuntime, { modulePath: MODULE_PATH }) +/* #else */ const wasi = new WASI(/* args */[MODULE_PATH], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin ConsoleStdout.lineBuffered((stdout) => { @@ -37,14 +51,19 @@ export async function defaultBrowserThreadSetup() { }), new PreopenDirectory("/", new Map()), ], { debug: false }) +/* #endif */ /* #endif */ return { /* #if IS_WASI */ +/* #if USE_UWASI */ + wasi, +/* #else */ wasi: Object.assign(wasi, { setInstance(instance) { wasi.inst = instance; } }), +/* #endif */ /* #endif */ threadChannel, } @@ -105,6 +124,15 @@ export async function defaultBrowserSetup(options) { const args = options.args ?? [] const onStdoutLine = options.onStdoutLine ?? ((line) => console.log(line)) const onStderrLine = options.onStderrLine ?? ((line) => console.error(line)) +/* #if USE_UWASI */ + const { wasi } = createUwasi(uwasiRuntime, { + modulePath: MODULE_PATH, + args, + onStdoutLine, + onStderrLine, + sleep: browserMainThreadSleep(), + }) +/* #else */ const wasi = new WASI(/* args */[MODULE_PATH, ...args], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin ConsoleStdout.lineBuffered((stdout) => { @@ -116,6 +144,7 @@ export async function defaultBrowserSetup(options) { new PreopenDirectory("/", new Map()), ], { debug: false }) /* #endif */ +/* #endif */ /* #if USE_SHARED_MEMORY */ const memory = new WebAssembly.Memory(MEMORY_TYPE); const threadChannel = new DefaultBrowserThreadRegistry(options.spawnWorker || createDefaultWorkerFactory()) @@ -127,12 +156,16 @@ export async function defaultBrowserSetup(options) { getImports() { return options.getImports() }, /* #endif */ /* #if IS_WASI */ +/* #if USE_UWASI */ + wasi, +/* #else */ wasi: Object.assign(wasi, { setInstance(instance) { wasi.inst = instance; } }), /* #endif */ +/* #endif */ /* #if USE_SHARED_MEMORY */ memory, threadChannel, /* #endif */ diff --git a/Plugins/PackageToJS/Templates/platforms/node.js b/Plugins/PackageToJS/Templates/platforms/node.js index 3e1253965..4725201b7 100644 --- a/Plugins/PackageToJS/Templates/platforms/node.js +++ b/Plugins/PackageToJS/Templates/platforms/node.js @@ -3,8 +3,22 @@ import { fileURLToPath } from "node:url"; import { Worker, parentPort } from "node:worker_threads"; import { MODULE_PATH /* #if USE_SHARED_MEMORY */, MEMORY_TYPE /* #endif */} from "../instantiate.js" /* #if IS_WASI */ +/* #if USE_UWASI */ +import { WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom } from 'uwasi'; +/* #if USE_UWASI_FILESYSTEM */ +import { MemoryFileSystem, useMemoryFS } from 'uwasi'; +/* #endif */ +import { createUwasi } from './uwasi.js'; +const uwasiRuntime = { + WASI, lineBuffered, useStdio, useArgs, useEnviron, useClock, usePoll, useProc, useRandom, +/* #if USE_UWASI_FILESYSTEM */ + MemoryFileSystem, useMemoryFS, +/* #endif */ +}; +/* #else */ import { WASI, File, OpenFile, ConsoleStdout, PreopenDirectory, Directory, Inode } from '@bjorn3/browser_wasi_shim'; /* #endif */ +/* #endif */ /* #if USE_SHARED_MEMORY */ export async function defaultNodeThreadSetup() { @@ -22,6 +36,9 @@ export async function defaultNodeThreadSetup() { } } +/* #if USE_UWASI */ + const { wasi } = createUwasi(uwasiRuntime, { modulePath: MODULE_PATH }) +/* #else */ const wasi = new WASI(/* args */[MODULE_PATH], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin ConsoleStdout.lineBuffered((stdout) => { @@ -32,13 +49,18 @@ export async function defaultNodeThreadSetup() { }), new PreopenDirectory("/", new Map()), ], { debug: false }) +/* #endif */ return { +/* #if USE_UWASI */ + wasi, +/* #else */ wasi: Object.assign(wasi, { setInstance(instance) { wasi.inst = instance; } }), +/* #endif */ threadChannel, } } @@ -119,6 +141,13 @@ export async function defaultNodeSetup(options = {}) { const { readFile } = await import("node:fs/promises") const args = options.args ?? process.argv.slice(2) +/* #if USE_UWASI */ + const { wasi } = createUwasi(uwasiRuntime, { + modulePath: MODULE_PATH, + args, + withExtractFile: true, + }) +/* #else */ const rootFs = new Map(); const wasi = new WASI(/* args */[MODULE_PATH, ...args], /* env */[], /* fd */[ new OpenFile(new File([])), // stdin @@ -130,6 +159,7 @@ export async function defaultNodeSetup(options = {}) { }), new PreopenDirectory("/", rootFs), ], { debug: false }) +/* #endif */ const pkgDir = path.dirname(path.dirname(fileURLToPath(import.meta.url))) const module = await WebAssembly.compile(new Uint8Array(await readFile(path.join(pkgDir, MODULE_PATH)))) /* #if USE_SHARED_MEMORY */ @@ -143,6 +173,9 @@ export async function defaultNodeSetup(options = {}) { getImports() { return {} }, /* #endif */ /* #if IS_WASI */ +/* #if USE_UWASI */ + wasi, +/* #else */ wasi: Object.assign(wasi, { setInstance(instance) { wasi.inst = instance; @@ -184,6 +217,7 @@ export async function defaultNodeSetup(options = {}) { return undefined; } }), +/* #endif */ addToCoreImports(importObject) { importObject["wasi_snapshot_preview1"]["proc_exit"] = (code) => { if (options.onExit) { diff --git a/Plugins/PackageToJS/Templates/platforms/uwasi.js b/Plugins/PackageToJS/Templates/platforms/uwasi.js new file mode 100644 index 000000000..56212a108 --- /dev/null +++ b/Plugins/PackageToJS/Templates/platforms/uwasi.js @@ -0,0 +1,85 @@ +// @ts-check + +/** + * Refuse blocking waits on the browser main thread, where UWASI would otherwise + * busy-wait. Workers and non-browser hosts can use UWASI's blocking default. + * + * @returns {((milliseconds: number) => void) | undefined} + */ +export function browserMainThreadSleep() { + if (typeof document === "undefined") return undefined; + return (milliseconds) => { + throw new Error( + `A WASI poll_oneoff wait of ${milliseconds}ms cannot block the browser main thread. ` + + "Run the guest in a worker to support blocking waits.", + ); + }; +} + +/** + * @param {{ + * WASI: any, + * lineBuffered: any, + * useStdio: any, + * useArgs: any, + * useEnviron: any, + * useClock: any, + * usePoll: any, + * useProc: any, + * useRandom: any, + * MemoryFileSystem?: any, + * useMemoryFS?: any, + * }} runtime + * @param {{ + * modulePath: string, + * args?: string[], + * onStdoutLine?: (line: string) => void, + * onStderrLine?: (line: string) => void, + * sleep?: (milliseconds: number) => void, + * withExtractFile?: boolean, + * }} options + */ +export function createUwasi(runtime, options) { + const args = options.args ?? []; + const onStdoutLine = options.onStdoutLine ?? ((line) => console.log(line)); + const onStderrLine = + options.onStderrLine ?? ((line) => console.error(line)); + const stdio = { + stdin: () => "", + stdout: runtime.lineBuffered(onStdoutLine), + stderr: runtime.lineBuffered(onStderrLine), + outputBuffers: true, + }; + const fileSystem = runtime.MemoryFileSystem + ? new runtime.MemoryFileSystem({ "/": "/" }) + : undefined; + const wasi = new runtime.WASI({ + args: [options.modulePath, ...args], + env: {}, + features: [ + fileSystem + ? runtime.useMemoryFS({ + withFileSystem: fileSystem, + withStdio: stdio, + }) + : runtime.useStdio(stdio), + runtime.useArgs(), + runtime.useEnviron(), + runtime.useClock(), + runtime.usePoll({ sleep: options.sleep }), + runtime.useProc(), + runtime.useRandom(), + ], + }); + + if (fileSystem && options.withExtractFile) { + Object.assign(wasi, { + extractFile(filePath) { + const node = fileSystem.lookup(filePath); + return node && node.type === "file" ? node.content : undefined; + }, + }); + } + + return { wasi, fileSystem }; +} diff --git a/Plugins/PackageToJS/Templates/runtime.mjs b/Plugins/PackageToJS/Templates/runtime.mjs index b0be54bb4..6170e58d0 100644 --- a/Plugins/PackageToJS/Templates/runtime.mjs +++ b/Plugins/PackageToJS/Templates/runtime.mjs @@ -759,7 +759,12 @@ class SwiftRuntime { swjs_load_typed_array: (ref, buffer) => { const memory = this.memory; const typedArray = memory.getObject(ref); - const bytes = new Uint8Array(typedArray.buffer); + // Copy only the window the view describes. `typedArray.buffer` + // is the whole backing `ArrayBuffer`, which may be larger than + // the view and may start before it; the guest sizes the + // destination from the view's own length, so viewing the entire + // buffer would both shift the bytes and overrun the destination. + const bytes = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength); this.getUint8Array().set(bytes, buffer >>> 0); }, swjs_release: (ref) => { diff --git a/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs b/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs new file mode 100644 index 000000000..8084c5805 --- /dev/null +++ b/Plugins/PackageToJS/Tests/Inputs/UWASIAdapterTests.mjs @@ -0,0 +1,177 @@ +import assert from "node:assert/strict"; +import { test } from "node:test"; +import { + MemoryFileSystem, + useArgs, + useClock, + useEnviron, + useMemoryFS, + usePoll, + useProc, + useRandom, + useStdio, + WASI, +} from "uwasi"; + +import { + browserMainThreadSleep, + createUwasi, +} from "../../Templates/platforms/uwasi.js"; + +const minimalRuntime = { + WASI, + useStdio, + useArgs, + useEnviron, + useClock, + usePoll, + useProc, + useRandom, +}; +const fileSystemRuntime = { ...minimalRuntime, MemoryFileSystem, useMemoryFS }; +const WASI_ERRNO_NOSYS = 52; + +function recordingLineBuffered() { + const calls = { count: 0 }; + const lineBuffered = (writeLine) => { + calls.count += 1; + return (chunk) => { + const line = new TextDecoder().decode(chunk).replace(/\n$/, ""); + writeLine(line); + }; + }; + return { calls, lineBuffered }; +} + +function bindMemory(wasi) { + const memory = new WebAssembly.Memory({ initial: 1 }); + wasi.setInstance({ exports: { memory } }); + return { + view: new DataView(memory.buffer), + bytes: new Uint8Array(memory.buffer), + }; +} + +function writeTo(wasi, { view, bytes }, fd, text) { + const chunk = new TextEncoder().encode(text); + bytes.set(chunk, 64); + view.setUint32(0, 64, true); + view.setUint32(4, chunk.length, true); + assert.equal(wasi.wasiImport.fd_write(fd, 0, 1, 8), 0); + assert.equal(view.getUint32(8, true), chunk.length); +} + +test("PackageToJS UWASI adapter preserves its host contracts with a file system", () => { + const stdout = []; + const stderr = []; + const { calls, lineBuffered } = recordingLineBuffered(); + const { wasi, fileSystem } = createUwasi( + { ...fileSystemRuntime, lineBuffered }, + { + modulePath: "main.wasm", + onStdoutLine: (line) => stdout.push(line), + onStderrLine: (line) => stderr.push(line), + withExtractFile: true, + }, + ); + const memory = bindMemory(wasi); + + writeTo(wasi, memory, 1, "output\n"); + writeTo(wasi, memory, 2, "error\n"); + assert.equal(calls.count, 2); + assert.deepEqual(stdout, ["output"]); + assert.deepEqual(stderr, ["error"]); + + fileSystem.addFile("/output.txt", "result"); + assert.equal( + new TextDecoder().decode(wasi.extractFile("/output.txt")), + "result", + ); +}); + +test("PackageToJS UWASI adapter omits the file system by default", () => { + const stdout = []; + const stderr = []; + const { calls, lineBuffered } = recordingLineBuffered(); + const { wasi, fileSystem } = createUwasi( + { ...minimalRuntime, lineBuffered }, + { + modulePath: "main.wasm", + onStdoutLine: (line) => stdout.push(line), + onStderrLine: (line) => stderr.push(line), + withExtractFile: true, + }, + ); + const memory = bindMemory(wasi); + + writeTo(wasi, memory, 1, "output\n"); + writeTo(wasi, memory, 2, "error\n"); + assert.equal(calls.count, 2); + assert.deepEqual(stdout, ["output"]); + assert.deepEqual(stderr, ["error"]); + + assert.equal(fileSystem, undefined); + assert.equal("extractFile" in wasi, false); + assert.equal(wasi.wasiImport.fd_prestat_get(3, 0), 8); + assert.equal( + wasi.wasiImport.path_open(3, 0, 0, 0, 0, 0n, 0n, 0, 0), + WASI_ERRNO_NOSYS, + ); + for (const name of [ + "args_get", + "environ_get", + "clock_time_get", + "poll_oneoff", + "proc_exit", + "random_get", + ]) { + assert.ok(wasi.wasiImport[name].length > 0, `${name} must be provided`); + } +}); + +for (const [name, runtime] of [ + ["minimal", minimalRuntime], + ["file system", fileSystemRuntime], +]) { + test(`PackageToJS forwards the host sleep policy (${name})`, (t) => { + t.mock.method(performance, "now", () => 0); + const { wasi } = createUwasi( + { ...runtime, lineBuffered: (writeLine) => writeLine }, + { + modulePath: "main.wasm", + sleep(milliseconds) { + throw new Error(`cannot block for ${milliseconds}ms`); + }, + }, + ); + const { view } = bindMemory(wasi); + + view.setBigUint64(0, 0n, true); + view.setUint8(8, 0); + view.setUint32(16, 1, true); + view.setBigUint64(24, 1_000_000n, true); + view.setBigUint64(32, 0n, true); + view.setUint16(40, 0, true); + + assert.throws( + () => wasi.wasiImport.poll_oneoff(0, 128, 1, 256), + /cannot block for 1ms/, + ); + }); +} + +test("PackageToJS blocks waits only on the browser main thread", () => { + assert.equal(browserMainThreadSleep(), undefined); + + globalThis.document = {}; + try { + const sleep = browserMainThreadSleep(); + assert.equal(typeof sleep, "function"); + assert.throws( + () => sleep(5), + /cannot block the browser main thread.*Run the guest in a worker/, + ); + } finally { + delete globalThis.document; + } +}); diff --git a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift index 4cff48e6c..d94e672bc 100644 --- a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift +++ b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift @@ -47,24 +47,49 @@ import Testing } typealias DebugInfoFormat = PackageToJS.DebugInfoFormat + typealias WASIRuntime = PackageToJS.PackageOptions.WASIRuntime @Test(arguments: [ - (variant: "debug", configuration: "debug", noOptimize: false, debugInfoFormat: DebugInfoFormat.none), - (variant: "release", configuration: "release", noOptimize: false, debugInfoFormat: DebugInfoFormat.none), + ( + variant: "debug", configuration: "debug", noOptimize: false, + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false + ), + ( + variant: "debug_uwasi", configuration: "debug", noOptimize: false, + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.uwasi, enableCodeCoverage: false + ), + ( + variant: "debug_uwasi_coverage", configuration: "debug", noOptimize: false, + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.uwasi, enableCodeCoverage: true + ), + ( + variant: "release", configuration: "release", noOptimize: false, + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false + ), ( variant: "release_no_optimize", configuration: "release", noOptimize: true, - debugInfoFormat: DebugInfoFormat.none + debugInfoFormat: DebugInfoFormat.none, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false + ), + ( + variant: "release_dwarf", configuration: "release", noOptimize: false, + debugInfoFormat: DebugInfoFormat.dwarf, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false + ), + ( + variant: "release_name", configuration: "release", noOptimize: false, + debugInfoFormat: DebugInfoFormat.name, wasiRuntime: WASIRuntime.browserWASIShim, enableCodeCoverage: false ), - (variant: "release_dwarf", configuration: "release", noOptimize: false, debugInfoFormat: DebugInfoFormat.dwarf), - (variant: "release_name", configuration: "release", noOptimize: false, debugInfoFormat: DebugInfoFormat.name), ]) func planBuild( variant: String, configuration: String, noOptimize: Bool, - debugInfoFormat: PackageToJS.DebugInfoFormat + debugInfoFormat: PackageToJS.DebugInfoFormat, + wasiRuntime: WASIRuntime, + enableCodeCoverage: Bool ) throws { - let options = PackageToJS.PackageOptions() + var options = PackageToJS.PackageOptions() + options.wasiRuntime = wasiRuntime + options.enableCodeCoverage = enableCodeCoverage let system = TestPackagingSystem() let planner = PackagingPlanner( options: options, diff --git a/Plugins/PackageToJS/Tests/TemplatesTests.swift b/Plugins/PackageToJS/Tests/TemplatesTests.swift index 5a27259c3..81240658b 100644 --- a/Plugins/PackageToJS/Tests/TemplatesTests.swift +++ b/Plugins/PackageToJS/Tests/TemplatesTests.swift @@ -15,9 +15,16 @@ import Foundation .appendingPathComponent("TemporaryDirectory") /// `npx tsc -p Templates/tsconfig.json` - /// Test both node and browser platform variants - @Test(arguments: ["node", "browser"]) - func tscCheck(platform: String) throws { + /// Test both WASI runtimes in node and browser platform variants. + @Test(arguments: [ + (platform: "node", runtime: "browser-wasi-shim", sharedMemory: false, filesystem: false), + (platform: "browser", runtime: "browser-wasi-shim", sharedMemory: false, filesystem: false), + (platform: "node", runtime: "uwasi", sharedMemory: false, filesystem: false), + (platform: "node", runtime: "uwasi", sharedMemory: false, filesystem: true), + (platform: "browser", runtime: "uwasi", sharedMemory: true, filesystem: false), + (platform: "browser", runtime: "uwasi", sharedMemory: false, filesystem: true), + ]) + func tscCheck(platform: String, runtime: String, sharedMemory: Bool, filesystem: Bool) throws { // Use a local temporary directory to place instantiated templates so that // they can reference repo-root node_modules packages like @types/node. try FileManager.default.createDirectory( @@ -32,9 +39,11 @@ import Foundation // Setup preprocessing conditions let conditions: [String: Bool] = [ - "USE_SHARED_MEMORY": false, + "USE_SHARED_MEMORY": sharedMemory, "IS_WASI": true, "USE_WASI_CDN": false, + "USE_UWASI": runtime == "uwasi", + "USE_UWASI_FILESYSTEM": runtime == "uwasi" && filesystem, "HAS_BRIDGE": false, "HAS_IMPORTS": false, "TARGET_DEFAULT_PLATFORM_NODE": platform == "node", @@ -47,6 +56,7 @@ import Foundation while let fileURL = enumerator?.nextObject() as? URL { guard !fileURL.hasDirectoryPath, fileURL.pathExtension == "js" || fileURL.pathExtension == "ts" + || fileURL.pathExtension == "json" else { continue } @@ -63,6 +73,41 @@ import Foundation try tsc.run() tsc.waitUntilExit() #expect(tsc.terminationStatus == 0) + + let platformSource = try String( + contentsOf: destination.appending(path: "platforms/") + .appending(path: "\(platform).js"), + encoding: .utf8 + ) + let expectedImport = runtime == "uwasi" ? "from 'uwasi'" : "from '@bjorn3/browser_wasi_shim'" + #expect(platformSource.contains(expectedImport)) + if runtime == "uwasi" { + #expect(!platformSource.contains("useAll")) + #expect(platformSource.contains("useStdio")) + #expect(platformSource.contains("MemoryFileSystem") == (platform == "node" && filesystem)) + } + + let manifestData = try Data(contentsOf: destination.appending(path: "package.json")) + let manifest = try #require( + JSONSerialization.jsonObject(with: manifestData) as? [String: Any] + ) + let dependencies = try #require(manifest["dependencies"] as? [String: String]) + let expectedDependency = runtime == "uwasi" ? "uwasi" : "@bjorn3/browser_wasi_shim" + #expect(dependencies.keys.sorted() == [expectedDependency]) } } + + @Test func uwasiAdapterBehavior() throws { + let node = Process() + node.executableURL = try which("node") + node.arguments = [ + "--test", + Self.pluginPackagePath + .appending(path: "Tests/Inputs/UWASIAdapterTests.mjs") + .path, + ] + try node.run() + node.waitUntilExit() + #expect(node.terminationStatus == 0) + } } diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json index fefcda9b2..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json new file mode 100644 index 000000000..b75adacfb --- /dev/null +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi.json @@ -0,0 +1,311 @@ +[ + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$INTERMEDIATES", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$INTERMEDIATES\/wasm-imports.json", + "wants" : [ + "$INTERMEDIATES" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$OUTPUT\/main.wasm", + "wants" : [ + "$OUTPUT" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/package.json", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT\/platforms", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.worker.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.worker.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/uwasi.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/uwasi.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.mjs", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + "phony", + "silent" + ], + "inputs" : [ + + ], + "output" : "all", + "wants" : [ + "$OUTPUT\/main.wasm", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/package.json", + "$OUTPUT\/index.js", + "$OUTPUT\/index.d.ts", + "$OUTPUT\/instantiate.js", + "$OUTPUT\/instantiate.d.ts", + "$OUTPUT\/platforms\/browser.js", + "$OUTPUT\/platforms\/browser.d.ts", + "$OUTPUT\/platforms\/browser.worker.js", + "$OUTPUT\/platforms\/node.js", + "$OUTPUT\/platforms\/node.d.ts", + "$OUTPUT\/runtime.js", + "$OUTPUT\/runtime.d.ts", + "$OUTPUT\/platforms\/uwasi.js" + ] + } +] \ No newline at end of file diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json new file mode 100644 index 000000000..c503152db --- /dev/null +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug_uwasi_coverage.json @@ -0,0 +1,311 @@ +[ + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$INTERMEDIATES", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$INTERMEDIATES\/wasm-imports.json", + "wants" : [ + "$INTERMEDIATES" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/index.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/index.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/instantiate.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/instantiate.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$WASM_PRODUCT_ARTIFACT" + ], + "output" : "$OUTPUT\/main.wasm", + "wants" : [ + "$OUTPUT" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/package.json", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json" + ] + }, + { + "attributes" : [ + "silent" + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH" + ], + "output" : "$OUTPUT\/platforms", + "wants" : [ + + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/browser.worker.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/browser.worker.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/node.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/node.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/platforms\/uwasi.js", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/platforms\/uwasi.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.d.ts", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + + ], + "inputs" : [ + "$PLANNER_SOURCE_PATH", + "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.mjs", + "$INTERMEDIATES\/wasm-imports.json" + ], + "output" : "$OUTPUT\/runtime.js", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOnRydWUsIlVTRV9VV0FTSV9GSUxFU1lTVEVNIjp0cnVlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "wants" : [ + "$OUTPUT", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/platforms" + ] + }, + { + "attributes" : [ + "phony", + "silent" + ], + "inputs" : [ + + ], + "output" : "all", + "wants" : [ + "$OUTPUT\/main.wasm", + "$INTERMEDIATES\/wasm-imports.json", + "$OUTPUT\/package.json", + "$OUTPUT\/index.js", + "$OUTPUT\/index.d.ts", + "$OUTPUT\/instantiate.js", + "$OUTPUT\/instantiate.d.ts", + "$OUTPUT\/platforms\/browser.js", + "$OUTPUT\/platforms\/browser.d.ts", + "$OUTPUT\/platforms\/browser.worker.js", + "$OUTPUT\/platforms\/node.js", + "$OUTPUT\/platforms\/node.d.ts", + "$OUTPUT\/runtime.js", + "$OUTPUT\/runtime.d.ts", + "$OUTPUT\/platforms\/uwasi.js" + ] + } +] \ No newline at end of file diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json index 32fc2b670..7a881a621 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json @@ -60,7 +60,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -77,7 +77,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -94,7 +94,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -111,7 +111,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -142,7 +142,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json index fefcda9b2..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json index 32fc2b670..7a881a621 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json @@ -60,7 +60,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -77,7 +77,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -94,7 +94,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -111,7 +111,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -142,7 +142,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -187,7 +187,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -204,7 +204,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -221,7 +221,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -238,7 +238,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -255,7 +255,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -272,7 +272,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json index fefcda9b2..5ac062bc4 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json @@ -46,7 +46,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -63,7 +63,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -80,7 +80,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -97,7 +97,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -127,7 +127,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -155,7 +155,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -172,7 +172,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -189,7 +189,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -206,7 +206,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -223,7 +223,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -240,7 +240,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -257,7 +257,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json index b6b382ae3..e9a0b9fea 100644 --- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json +++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json @@ -72,7 +72,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/bin\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -89,7 +89,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -106,7 +106,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/index.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -123,7 +123,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -140,7 +140,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/instantiate.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -170,7 +170,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/package.json", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json" @@ -198,7 +198,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -215,7 +215,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -232,7 +232,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/browser.worker.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -249,7 +249,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -266,7 +266,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/platforms\/node.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -283,7 +283,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -300,7 +300,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/runtime.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -317,7 +317,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.browser.html", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -334,7 +334,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.d.ts", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", @@ -351,7 +351,7 @@ "$INTERMEDIATES\/wasm-imports.json" ], "output" : "$OUTPUT\/test.js", - "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19", + "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfVVdBU0kiOmZhbHNlLCJVU0VfVVdBU0lfRklMRVNZU1RFTSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=", "wants" : [ "$OUTPUT", "$INTERMEDIATES\/wasm-imports.json", diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts index 879774a7d..e05bf712e 100644 --- a/Runtime/src/index.ts +++ b/Runtime/src/index.ts @@ -763,7 +763,16 @@ export class SwiftRuntime { swjs_load_typed_array: (ref: ref, buffer: pointer) => { const memory = this.memory; const typedArray = memory.getObject(ref); - const bytes = new Uint8Array(typedArray.buffer); + // Copy only the window the view describes. `typedArray.buffer` + // is the whole backing `ArrayBuffer`, which may be larger than + // the view and may start before it; the guest sizes the + // destination from the view's own length, so viewing the entire + // buffer would both shift the bytes and overrun the destination. + const bytes = new Uint8Array( + typedArray.buffer, + typedArray.byteOffset, + typedArray.byteLength, + ); this.getUint8Array().set(bytes, buffer >>> 0); }, diff --git a/Runtime/test/load-typed-array.test.ts b/Runtime/test/load-typed-array.test.ts new file mode 100644 index 000000000..724aa23fa --- /dev/null +++ b/Runtime/test/load-typed-array.test.ts @@ -0,0 +1,107 @@ +import { describe, expect, test } from "vitest"; +import { SwiftRuntime } from "../src/index.js"; + +// `swjs_load_typed_array` must copy only the window a TypedArray view describes, +// not its whole backing `ArrayBuffer`. The guest sizes the destination from the +// view's own `length`/`byteLength`, so copying the entire buffer both shifts the +// bytes (a view with a non-zero `byteOffset` lands offset in the guest) and +// writes past the end of the destination. +const DESTINATION = 1024; + +function makeRuntime(): { runtime: SwiftRuntime; memory: WebAssembly.Memory } { + const memory = new WebAssembly.Memory({ initial: 1 }); + const runtime = new SwiftRuntime(); + runtime.setInstance({ + exports: { + memory, + swjs_library_version: () => 708, + }, + } as unknown as WebAssembly.Instance); + return { runtime, memory }; +} + +describe("swjs_load_typed_array respects the view's window", () => { + test("copies a Uint8Array view from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).set( + Array.from({ length: 32 }, (_, i) => 0xa0 + i), + ); + const view = new Uint8Array(backing, 8, 8); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 8)), + ).toEqual(Array.from(view)); + }); + + test("does not write past the end of the view", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).fill(0xff); + const view = new Uint8Array(backing, 8, 8); + + // Fill the guest memory around the destination with a sentinel so any + // byte written beyond the view's `byteLength` is visible. + const guest = new Uint8Array(memory.buffer); + guest.fill(0x5a, DESTINATION, DESTINATION + 64); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + expect( + Array.from(guest.subarray(DESTINATION + 8, DESTINATION + 64)), + ).toEqual(new Array(56).fill(0x5a)); + }); + + test("copies a multi-byte element view from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Int32Array(backing).set([1, 2, 3, 4, 5, 6, 7, 8]); + const view = new Int32Array(backing, 8, 4); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Int32Array(memory.buffer, DESTINATION, 4); + expect(Array.from(guest)).toEqual([3, 4, 5, 6]); + }); + + test("copies a DataView from its byteOffset", () => { + const { runtime, memory } = makeRuntime(); + const backing = new ArrayBuffer(32); + new Uint8Array(backing).set( + Array.from({ length: 32 }, (_, i) => 0xa0 + i), + ); + const view = new DataView(backing, 8, 8); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 8)), + ).toEqual(Array.from(new Uint8Array(backing, 8, 8))); + }); + + test("still copies a whole-buffer view unchanged", () => { + const { runtime, memory } = makeRuntime(); + const view = new Uint8Array([1, 2, 3, 4, 5]); + + const space = (runtime as any).memory; + const imports = runtime.wasmImports as any; + imports.swjs_load_typed_array(space.retain(view), DESTINATION); + + const guest = new Uint8Array(memory.buffer); + expect( + Array.from(guest.subarray(DESTINATION, DESTINATION + 5)), + ).toEqual([1, 2, 3, 4, 5]); + }); +}); diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift new file mode 100644 index 000000000..dbcd30b9f --- /dev/null +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop+YieldInterval.swift @@ -0,0 +1,103 @@ +// Clock and host task scheduling for `JavaScriptEventLoop.yieldInterval`. + +import JavaScriptKit +import _Concurrency + +#if compiler(>=5.5) + +@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) +extension JavaScriptEventLoop { + + #if hasFeature(Embedded) + // `ContinuousClock` is unavailable in Embedded Swift; use `performance.now()` in milliseconds. + typealias DrainInstant = Double + + func drainClockNow() -> DrainInstant { + if performanceNow == nil { + let performance = JSObject.global.performance.object! + performanceNow = (performance, performance.now.function!) + } + return performanceNow!.now(this: performanceNow!.performance).number! + } + + func drainElapsed(since start: DrainInstant) -> Duration { + .milliseconds(drainClockNow() - start) + } + #else + typealias DrainInstant = ContinuousClock.Instant + + func drainClockNow() -> DrainInstant { + ContinuousClock.now + } + + func drainElapsed(since start: DrainInstant) -> Duration { + start.duration(to: .now) + } + #endif + + /// Runs `body` in a new JavaScript task via `setImmediate`, `MessageChannel`, or `setTimeout`. + func queueHostTask(_ body: @escaping () -> Void) { + if hostTaskScheduler == nil { + hostTaskScheduler = Self.makeHostTaskScheduler() + } + hostTaskScheduler!(body) + } + + private static func makeHostTaskScheduler() -> (@escaping () -> Void) -> Void { + let global = JSObject.global + if let setImmediate = global.setImmediate.function { + return { body in + _ = setImmediate( + JSOneshotClosure { _ in + body() + return .undefined + } + ) + } + } + if let messageChannel = global.MessageChannel.function { + // Unlike nested `setTimeout` calls, messages are not clamped to 4 ms. + let channel = messageChannel.new(arguments: [JSValue]()) + let sender = channel.port1.object! + let postMessage = sender.postMessage.function! + let pending = PendingHostTasks() + let receiver = JSClosure { _ in + pending.runAll() + return .undefined + } + channel.port2.object!.onmessage = .object(receiver) + return { body in + pending.bodies.append(body) + // Keep `receiver` alive as long as the scheduler. + withExtendedLifetime(receiver) { + _ = postMessage(this: sender, JSValue.undefined) + } + } + } + let setTimeout = global.setTimeout.function! + return { body in + _ = setTimeout( + JSOneshotClosure { _ in + body() + return .undefined + }, + 0 + ) + } + } +} + +/// Bodies waiting for the next `MessageChannel` message. +private final class PendingHostTasks { + var bodies: [() -> Void] = [] + + func runAll() { + let bodies = self.bodies + self.bodies = [] + for body in bodies { + body() + } + } +} + +#endif diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift index ead6157bf..ffca27795 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift @@ -48,6 +48,26 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable { /// A function that invokes a given closure after a specified number of milliseconds. public var setTimeout: (Double, @escaping () -> Void) -> Void + /// The maximum time to run queued jobs before yielding to the JavaScript event loop. + /// + /// By default (`nil`), all queued jobs run in a single microtask, so long-running async work + /// blocks rendering, input, and other JavaScript tasks until it completes. When set, the + /// remaining jobs continue in a new JavaScript task after the interval, at the cost of some + /// latency. A single job is never interrupted. + /// + /// ```swift + /// JavaScriptEventLoop.shared.yieldInterval = .milliseconds(16) + /// ``` + public var yieldInterval: Duration? + + /// Continues a drain that stopped at ``yieldInterval``. Created lazily. + var hostTaskScheduler: ((@escaping () -> Void) -> Void)? + + #if hasFeature(Embedded) + /// Cached `performance.now` used by ``yieldInterval`` in Embedded Swift. + var performanceNow: (performance: JSObject, now: JSFunction)? + #endif + /// A mutable state to manage internal job queue /// Note that this should be guarded atomically when supporting multi-threaded environment. var queueState = QueueState() diff --git a/Sources/JavaScriptEventLoop/JobQueue.swift b/Sources/JavaScriptEventLoop/JobQueue.swift index a0f2c4bbb..8ca74e1c8 100644 --- a/Sources/JavaScriptEventLoop/JobQueue.swift +++ b/Sources/JavaScriptEventLoop/JobQueue.swift @@ -1,6 +1,6 @@ // This file contains the job queue implementation which re-order jobs based on their priority. -// The current implementation is much simple to be easily debugged, but should be re-implemented -// using priority queue ideally. +// Jobs form runs, one per priority in descending order, FIFO within a run. The first job of each +// run points to its last job, so an insert steps over whole runs. import _Concurrency import _CJavaScriptEventLoop @@ -19,15 +19,18 @@ extension JavaScriptEventLoop { func insertJobQueue(job newJob: UnownedJob) { withUnsafeMutablePointer(to: &queueState.headJob) { headJobPtr in var position: UnsafeMutablePointer = headJobPtr - while let cur = position.pointee { - if cur.rawPriority < newJob.rawPriority { - newJob.nextInQueue().pointee = cur - position.pointee = newJob + while let runHead = position.pointee, runHead.rawPriority >= newJob.rawPriority { + let runTail = runHead.lastInRun().pointee! + if runHead.rawPriority == newJob.rawPriority { + newJob.nextInQueue().pointee = runTail.nextInQueue().pointee + runTail.nextInQueue().pointee = newJob + runHead.lastInRun().pointee = newJob return } - position = cur.nextInQueue() + position = runTail.nextInQueue() } - newJob.nextInQueue().pointee = nil + newJob.nextInQueue().pointee = position.pointee + newJob.lastInRun().pointee = newJob position.pointee = newJob } @@ -43,12 +46,37 @@ extension JavaScriptEventLoop { func runAllJobs() { assert(queueState.isSpinning) + // The clock is only read while `yieldInterval` is set. + var start: DrainInstant? = yieldInterval == nil ? nil : drainClockNow() + // A clock read costs more than a small job. Read it every `clockStride` jobs, and double + // the stride (up to 256) while the drain is far from the interval. + var clockStride = 1 + var jobsUntilClockRead = 1 while let job = self.claimNextFromQueue() { #if compiler(>=5.9) job.runSynchronously(on: self.asUnownedSerialExecutor()) #else job._runSynchronously(on: self.asUnownedSerialExecutor()) #endif + + if let yieldInterval, queueState.headJob != nil { + if let start { + jobsUntilClockRead -= 1 + if jobsUntilClockRead > 0 { continue } + let elapsed = drainElapsed(since: start) + if elapsed >= yieldInterval { + // Keep `isSpinning` set so new jobs wait for the continuation. + queueHostTask { self.runAllJobs() } + return + } + if elapsed * 4 < yieldInterval { + clockStride = min(clockStride * 2, 256) + } + jobsUntilClockRead = clockStride + } else { + start = drainClockNow() + } + } } queueState.isSpinning = false @@ -56,7 +84,14 @@ extension JavaScriptEventLoop { func claimNextFromQueue() -> UnownedJob? { if let job = self.queueState.headJob { - self.queueState.headJob = job.nextInQueue().pointee + let nextJob = job.nextInQueue().pointee + if let nextJob { + let runTail = job.lastInRun().pointee! + if !runTail.isSameJob(as: job) { + nextJob.lastInRun().pointee = runTail + } + } + self.queueState.headJob = nextJob return job } return nil @@ -82,6 +117,16 @@ extension UnownedJob { } } + /// The last job of the run. Valid only on the first job of a run. + fileprivate func lastInRun() -> UnsafeMutablePointer { + return withUnsafeMutablePointer(to: &asImpl().pointee.SchedulerPrivate.1) { rawLastJobPtr in + UnsafeMutableRawPointer(rawLastJobPtr).bindMemory(to: UnownedJob?.self, capacity: 1) + } + } + + fileprivate func isSameJob(as other: UnownedJob) -> Bool { + asImpl() == other.asImpl() + } } private struct JobFlags { diff --git a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift index ab0a9f4f0..0b7fc3120 100644 --- a/Sources/JavaScriptKit/BridgeJSIntrinsics.swift +++ b/Sources/JavaScriptKit/BridgeJSIntrinsics.swift @@ -452,7 +452,7 @@ extension _BridgedSwiftAlias where JSRepresentation: _BridgedSwiftAssociatedValu extension _BridgedSwiftAlias where JSRepresentation == String { // MARK: ImportTS - @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32) -> T) -> T { + @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32, Int32) -> T) -> T { bridgeToJS().bridgeJSWithLoweredParameter(body) } @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ bytesCount: Int32) -> Self { @@ -476,7 +476,7 @@ extension _BridgedSwiftAlias where JSRepresentation == String { extension _BridgedAsOptional where Wrapped: _BridgedSwiftAlias, Wrapped.JSRepresentation == String { @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter( - _ body: (Int32, Int32, Int32) -> T + _ body: (Int32, Int32, Int32, Int32) -> T ) -> T { asOptional.map { $0.bridgeToJS() }.bridgeJSWithLoweredParameter(body) } @@ -798,12 +798,29 @@ extension Double: _BridgedSwiftTypeLoweredIntoSingleWasmCoreType, _BridgedSwiftS extension String: _BridgedSwiftStackType { public typealias StackLiftResult = String + /// Lends the three wasm32 `String` words to `body` for the duration of a synchronous JS call. + /// + /// The 12-byte layout is a Swift stdlib implementation detail. JS interprets small-string + /// flags in `word2` and, for large strings, UTF-8 at `word1 + 20` (`nativeBias` on 32-bit). + @inline(__always) + fileprivate consuming func withBridgeJSRawWords(_ body: (Int32, Int32, Int32) -> Result) -> Result { + #if arch(wasm32) + return withUnsafeBytes(of: self) { bytes in + precondition(bytes.count == 12, "BridgeJS expects the 12-byte wasm32 String layout") + let word0 = bytes.load(fromByteOffset: 0, as: Int32.self) + let word1 = bytes.load(fromByteOffset: 4, as: Int32.self) + let word2 = bytes.load(fromByteOffset: 8, as: Int32.self) + return body(word0, word1, word2) + } + #else + _onlyAvailableOnWasm() + #endif + } + // MARK: ImportTS - @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32) -> T) -> T { - return self.withUTF8 { b in - body(Int32(bitPattern: UInt32(UInt(bitPattern: b.baseAddress))), Int32(b.count)) - } + @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32, Int32) -> T) -> T { + withBridgeJSRawWords(body) } @_spi(BridgeJS) public static func bridgeJSLiftReturn(_ bytesCount: Int32) -> String { @@ -835,14 +852,14 @@ extension String: _BridgedSwiftStackType { } @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { - return self.withUTF8 { ptr in - _swift_js_return_string(ptr.baseAddress, Int32(ptr.count)) + withBridgeJSRawWords { word0, word1, word2 in + _swift_js_return_string(word0, word1, word2) } } @_spi(BridgeJS) public consuming func bridgeJSStackPush() { - self.withUTF8 { ptr in - _swift_js_push_string(ptr.baseAddress, Int32(ptr.count)) + withBridgeJSRawWords { word0, word1, word2 in + _swift_js_push_string(word0, word1, word2) } } } @@ -952,11 +969,14 @@ extension JSValue: _BridgedSwiftStackType { } @_spi(BridgeJS) public consuming func bridgeJSStackPush() -> Void { - let lowered = bridgeJSLowerParameter() - let retainedPayload1 = Self.bridgeJSRetainPayloadIfNeeded(kind: lowered.kind, payload1: lowered.payload1) - _swift_js_push_i32(lowered.kind) - _swift_js_push_i32(retainedPayload1) - _swift_js_push_f64(lowered.payload2) + // Retain inside `withRawJSValue` so `self` still owns the JS reference. + withRawJSValue { raw in + let kind = Int32(raw.kind.rawValue) + let payload1 = Int32(bitPattern: raw.payload1) + _swift_js_push_i32(kind) + _swift_js_push_i32(Self.bridgeJSRetainPayloadIfNeeded(kind: kind, payload1: payload1)) + _swift_js_push_f64(raw.payload2) + } } @_spi(BridgeJS) public consuming func bridgeJSLowerParameter() -> (kind: Int32, payload1: Int32, payload2: Double) { @@ -969,19 +989,18 @@ extension JSValue: _BridgedSwiftStackType { } } + /// Takes ownership of the payload reference that JavaScript retained when it lowered the value. @_spi(BridgeJS) public static func bridgeJSLiftParameter( _ kind: Int32, _ payload1: Int32, _ payload2: Double ) -> JSValue { - let retainedPayload1 = bridgeJSRetainPayloadIfNeeded(kind: kind, payload1: payload1) - guard let kindEnum = JavaScriptValueKind(rawValue: UInt32(kind)) else { fatalError("Invalid JSValue kind: \(kind)") } let rawValue = RawJSValue( kind: kindEnum, - payload1: JavaScriptPayload1(UInt32(bitPattern: retainedPayload1)), + payload1: JavaScriptPayload1(UInt32(bitPattern: payload1)), payload2: payload2 ) return rawValue.jsValue @@ -1145,6 +1164,23 @@ extension _BridgedSwiftProtocolExportable where Self: _BridgedSwiftProtocolWrapp } } +#if !hasFeature(Embedded) +/// Checks that a protocol value can be lowered to JavaScript. +@_spi(BridgeJS) public func _bridgeJSUnwrapProtocolExportable( + _ value: Any, + _ protocolName: StaticString +) -> any _BridgedSwiftProtocolExportable { + guard let exportable = value as? any _BridgedSwiftProtocolExportable else { + fatalError( + "BridgeJS: cannot bridge a value of type '\(type(of: value))' to JavaScript as " + + "'any \(protocolName)': the concrete type is not exported with @JS. Only '@JS class' " + + "types and JavaScript-provided implementations can cross the bridge as protocol values." + ) + } + return exportable +} +#endif + /// A protocol that Swift enum types that do not have a payload can conform to. /// /// The conformance is automatically synthesized by the BridgeJS code generator. @@ -1273,7 +1309,7 @@ extension _BridgedSwiftStruct { extension _BridgedSwiftEnumNoPayload where Self: RawRepresentable, RawValue == String { // MARK: ImportTS - @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32) -> T) -> T { + @_spi(BridgeJS) public consuming func bridgeJSWithLoweredParameter(_ body: (Int32, Int32, Int32) -> T) -> T { rawValue.bridgeJSWithLoweredParameter(body) } @@ -1331,15 +1367,15 @@ private func _swift_js_init_memory_extern(_ sourceId: Int32, _ ptr: UnsafeMutabl #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_push_string") -private func _swift_js_push_string_extern(_ ptr: UnsafePointer?, _ len: Int32) +private func _swift_js_push_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) #else -private func _swift_js_push_string_extern(_ ptr: UnsafePointer?, _ len: Int32) { +private func _swift_js_push_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) { _onlyAvailableOnWasm() } #endif -@_spi(BridgeJS) @inline(never) public func _swift_js_push_string(_ ptr: UnsafePointer?, _ len: Int32) { - _swift_js_push_string_extern(ptr, len) +@_spi(BridgeJS) @inline(never) public func _swift_js_push_string(_ word0: Int32, _ word1: Int32, _ word2: Int32) { + _swift_js_push_string_extern(word0, word1, word2) } #if arch(wasm32) @@ -1525,15 +1561,15 @@ extension UInt: _BridgedNumericArray { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_make_js_string") -private func _swift_js_make_js_string_extern(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 +private func _swift_js_make_js_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) -> Int32 #else -/// Creates a JavaScript string from UTF-8 data in WebAssembly memory -private func _swift_js_make_js_string_extern(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 { +/// Creates a JavaScript string from the wasm32 Swift `String` layout words +private func _swift_js_make_js_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) -> Int32 { _onlyAvailableOnWasm() } #endif -@inline(never) func _swift_js_make_js_string(_ ptr: UnsafePointer?, _ len: Int32) -> Int32 { - _swift_js_make_js_string_extern(ptr, len) +@inline(never) func _swift_js_make_js_string(_ word0: Int32, _ word1: Int32, _ word2: Int32) -> Int32 { + _swift_js_make_js_string_extern(word0, word1, word2) } #if arch(wasm32) @@ -1551,15 +1587,15 @@ private func _swift_js_init_memory_with_result_extern(_ ptr: UnsafePointer?, _ len: Int32) +private func _swift_js_return_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) #else /// Write a string to reserved string storage to be returned to JavaScript -private func _swift_js_return_string_extern(_ ptr: UnsafePointer?, _ len: Int32) { +private func _swift_js_return_string_extern(_ word0: Int32, _ word1: Int32, _ word2: Int32) { _onlyAvailableOnWasm() } #endif -@inline(never) func _swift_js_return_string(_ ptr: UnsafePointer?, _ len: Int32) { - _swift_js_return_string_extern(ptr, len) +@inline(never) func _swift_js_return_string(_ word0: Int32, _ word1: Int32, _ word2: Int32) { + _swift_js_return_string_extern(word0, word1, word2) } #if arch(wasm32) @@ -1640,15 +1676,15 @@ private func _swift_js_get_optional_string_extern() -> Int32 { #if arch(wasm32) @_extern(wasm, module: "bjs", name: "swift_js_return_optional_string") -private func _swift_js_return_optional_string_extern(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) +private func _swift_js_return_optional_string_extern(_ isSome: Int32, _ word0: Int32, _ word1: Int32, _ word2: Int32) #else /// Write an optional string to reserved string storage to be returned to JavaScript -private func _swift_js_return_optional_string_extern(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) { +private func _swift_js_return_optional_string_extern(_ isSome: Int32, _ word0: Int32, _ word1: Int32, _ word2: Int32) { _onlyAvailableOnWasm() } #endif -@inline(never) func _swift_js_return_optional_string(_ isSome: Int32, _ ptr: UnsafePointer?, _ len: Int32) { - _swift_js_return_optional_string_extern(isSome, ptr, len) +@inline(never) func _swift_js_return_optional_string(_ isSome: Int32, _ word0: Int32, _ word1: Int32, _ word2: Int32) { + _swift_js_return_optional_string_extern(isSome, word0, word1, word2) } #if arch(wasm32) @@ -2139,14 +2175,14 @@ extension _BridgedAsOptional where Wrapped == Bool { extension _BridgedAsOptional where Wrapped == String { @_spi(BridgeJS) @_transparent public consuming func bridgeJSWithLoweredParameter( - _ body: (Int32, Int32, Int32) -> T + _ body: (Int32, Int32, Int32, Int32) -> T ) -> T { switch asOptional { case .none: - return body(0, 0, 0) + return body(0, 0, 0, 0) case .some(let value): - return value.bridgeJSWithLoweredParameter { bytes, count in - return body(1, bytes, count) + return value.bridgeJSWithLoweredParameter { word0, word1, word2 in + return body(1, word0, word1, word2) } } } @@ -2177,10 +2213,10 @@ extension _BridgedAsOptional where Wrapped == String { @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() -> Void { switch asOptional { case .none: - _swift_js_return_optional_string(0, nil, 0) - case .some(var value): - value.withUTF8 { ptr in - _swift_js_return_optional_string(1, ptr.baseAddress, Int32(ptr.count)) + _swift_js_return_optional_string(0, 0, 0, 0) + case .some(let value): + value.withBridgeJSRawWords { word0, word1, word2 in + _swift_js_return_optional_string(1, word0, word1, word2) } } } @@ -2341,14 +2377,14 @@ extension _BridgedAsOptional where Wrapped: _BridgedSwiftCaseEnum { extension _BridgedAsOptional where Wrapped: _BridgedSwiftEnumNoPayload, Wrapped: RawRepresentable, Wrapped.RawValue == String { @_spi(BridgeJS) @_transparent public consuming func bridgeJSWithLoweredParameter( - _ body: (Int32, Int32, Int32) -> T + _ body: (Int32, Int32, Int32, Int32) -> T ) -> T { switch asOptional { case .none: - return body(0, 0, 0) + return body(0, 0, 0, 0) case .some(let wrapped): - return wrapped.bridgeJSWithLoweredParameter { bytes, count in - return body(1, bytes, count) + return wrapped.bridgeJSWithLoweredParameter { word0, word1, word2 in + return body(1, word0, word1, word2) } } } @@ -2574,13 +2610,13 @@ where Key == String, Value: _BridgedSwiftStackType, Value.StackLiftResult == Val /// /// The closure factories are dependency-injected because this library cannot /// reference per-module generated `make_swift_closure_*` externs. The generated -/// code passes `{ JSTypedClosure<(T) -> Void>($0) }` which uses the per-module -/// convenience init. +/// code passes `{ JSTypedClosure<(sending T) -> Void>.sending($0) }` using the +/// per-module callback factory. /// /// - Parameters: -/// - makeResolveClosure: A factory that wraps a `(T) -> Void` Swift closure +/// - makeResolveClosure: A factory that wraps a `(sending T) -> Void` Swift closure /// into a typed `JSTypedClosure`, creating the corresponding JS function. -/// - makeRejectClosure: A factory that wraps a `(JSValue) -> Void` Swift closure +/// - makeRejectClosure: A factory that wraps a `(sending JSValue) -> Void` Swift closure /// into a `JSTypedClosure`, for the rejection path. /// - body: A closure that receives the resolve and reject JS object refs /// (as `Int32`) and should pass them to the appropriate JS extern function. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md index 8a1b7dff5..09bc51d79 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md @@ -77,6 +77,48 @@ export type Exports = { } ``` +## Choosing an Exported Name + +Pass a name to `@JS` to expose a class under a different JavaScript and TypeScript name while keeping its Swift identifier: + +```swift +@JS("Counter") class InternalCounter { + @JS var value: Int + + @JS init(value: Int) { + self.value = value + } + + @JS static func make(_ value: Int) -> InternalCounter { + InternalCounter(value: value) + } + + @JS func roundTrip(_ other: InternalCounter?) -> InternalCounter? { + other + } +} +``` + +After initializing the package, use the constructor and static factory on that WASM instance's `exports` object: + +```javascript +const counter = new exports.Counter(1); +const other = exports.Counter.make(2); +const returned = counter.roundTrip(other); +console.log(returned.value); // 2 +returned.release(); +other.release(); +counter.release(); +``` + +The generated TypeScript interface is named `Counter`, and signatures refer to `Counter`, including in optionals, arrays, and callbacks. For example, `roundTrip` accepts and returns `Counter | null`. The old name `InternalCounter` is not also exported. Swift code continues to use `InternalCounter`, including in extensions and return types. + +The constructor remains instance-owned: use `exports.Counter`, not a named JavaScript module import such as `import { Counter } from "./bridge-js.js"`. A TypeScript type-only import of `Counter` refers to the generated interface, not a constructor value. Renaming does not change reference semantics, `release()`, or identity mode. + +This naming option also applies to structs, enums, and protocols. For namespace composition and nested types, see . + +> Important: `@JS("Counter")` only changes the exported symbol. `@JS(as: Other.self)` instead changes the JavaScript representation through `bridgeToJS()` and `bridgeFromJS(_:)`. Combining a name override with `as:` on the same declaration produces a diagnostic. + ## Adding Members via Extensions You can add exported methods, computed properties, and static members to a `@JS` class using extensions. The extension block itself does not need `@JS` - only the individual members do: diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md index 68996b27b..6d7af6799 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md @@ -19,6 +19,35 @@ BridgeJS generates separate objects with descriptive naming for `.const` enums: - **`EnumNameTag`**: Represents the union type for enums - **`EnumNameObject`**: Object type for all const-style enums, contains static members for enums with methods/properties or references the values type for simple enums +### Choosing an Exported Name + +A name passed to `@JS` changes the generated naming stem, not the Swift enum or its representation: + +```swift +@JS("TaskState") enum InternalTaskState: String { + case pending + case complete +} + +@JS func roundTripState(_ state: InternalTaskState) -> InternalTaskState { + state +} +``` + +With the default `.const` style, this generates `TaskStateValues`, `TaskStateTag`, and `TaskStateObject` instead of names beginning with `InternalTaskState`. The instance export is `exports.TaskState`, and function signatures use `TaskStateTag`: + +```typescript +import { TaskStateValues } from "./bridge-js.js"; +import type { TaskStateTag } from "./bridge-js.js"; + +const state: TaskStateTag = exports.roundTripState(TaskStateValues.Pending); +console.log(state === exports.TaskState.Pending); // true +``` + +The same naming rule applies to associated-value enums, including their payload type references. With `@JS("TaskState", enumStyle: .tsEnum)`, the TypeScript enum itself is named `TaskState`. Case names, raw values, and associated-value layouts are unchanged. + +For empty enums used as namespaces, the override names the namespace object. Nested declarations use that renamed parent in their export paths; see . + ### Case Enums ```swift diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md index 3b2ec1526..5bc907137 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Protocols.md @@ -13,6 +13,10 @@ When you mark a protocol with `@JS`, BridgeJS generates: - A TypeScript interface with the protocol's method signatures - A Swift wrapper struct (`Any{ProtocolName}`) that conforms to the protocol and bridges calls to JavaScript objects +Use `@JS("PublicName")` on a protocol to rename its TypeScript interface and generated type references. Swift still uses the original protocol name for conformances and signatures. JavaScript objects still satisfy the interface structurally; renaming does not create a protocol constructor or change how callbacks and protocol values cross the boundary. Unlike `@JS(as: Other.self)`, it does not change the representation, and combining the two options is not supported. + +An `@JS` protocol can refine other `@JS` protocols declared in the same module. Its generated TypeScript interface and Swift wrapper expose inherited methods and properties. Cross-module protocol refinement is not supported. + ## Example: Counter Protocol Mark a Swift protocol with `@JS` to expose it: @@ -213,13 +217,17 @@ struct AnyCounter: Counter, _BridgedSwiftProtocolWrapper { | Swift Feature | Status | |:--------------|:-------| | Method requirements: `func foo(_ param: String?) -> FooClass?` | ✅ | +| Throwing method requirements: `func foo() throws(JSException)` | ✅ | +| Async method requirements: `func foo() async throws(JSException) -> Bar` | ✅ | | Property requirements: `var property: Type { get }` / `var property: Type { get set }` | ✅ | | Optional parameters / return values in methods | ✅ | | Optional properties | ✅ | | Optional protocol methods | ❌ | | Associated types | ❌ | -| Protocol inheritance | ❌ | -| Protocol composition: `Protocol1 & Protocol2` | ❌ | -| Generics | ❌ | +| Same-module `@JS` protocol inheritance | ✅ | +| Cross-module protocol inheritance | ❌ | +| Existential protocol composition: `any Protocol1 & Protocol2` | ❌ | +| Generic requirements | ❌ | +| Protocol-valued properties, parameters, or results in requirements | ❌ | -> Note: Protocol type support matches that of regular `@JS func` and `@JS class` exports. See , , and for more information. +> Note: For supported requirement types, see , , and . diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md index c4a9524d9..208c80a25 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md @@ -6,7 +6,9 @@ Learn how to export Swift structs to JavaScript. > Tip: You can quickly preview what interfaces will be exposed on the Swift/JavaScript/TypeScript sides using the [BridgeJS Playground](https://swiftwasm.org/JavaScriptKit/PlayBridgeJS/). -To export a Swift struct, mark it with `@JS`: +To export a Swift struct, mark it with `@JS`. + +Use `@JS("PublicName")` to choose a different JavaScript and TypeScript name while keeping the Swift struct name. Generated interfaces, type references, and the instance export containing any exported initializer or static members use the chosen name. This does not change copy semantics or field names. Unlike `@JS(as: Other.self)`, it does not change the representation; the two options cannot be combined. See for an example of naming an exported type. ```swift import JavaScriptKit diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md index 1aff82f65..e24f45a24 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Using-Namespace.md @@ -121,3 +121,45 @@ export interface Greeter extends SwiftHeapObject { ``` Using namespaces can be preferable for projects with many global functions, as they help prevent naming collisions. Namespaces also provide intuitive hierarchies for organizing your exported Swift code, and they do not affect the code generated by `@JS` declarations without namespaces. + +## Renamed Types in Namespaces + +The first argument to `@JS` controls a declaration's exported name; `namespace:` controls where it appears. Use both to separate Swift implementation names from your JavaScript API. + +Type names must be valid JavaScript/TypeScript identifiers. + +```swift +@JS("Store", namespace: "MyApp") enum InternalStore { + @JS("Item") class InternalItem { + @JS var title: String + + @JS init(title: String) { + self.title = title + } + + @JS enum State: String { + case available + case reserved + } + } + + @JS static func makeItem(_ title: String) -> InternalStore.InternalItem { + InternalStore.InternalItem(title: title) + } +} +``` + +Nested declarations use their parents' exported names, even when a nested declaration has no name override of its own: + +```javascript +const item = new exports.MyApp.Store.Item("Notebook"); +const another = exports.MyApp.Store.makeItem("Pencil"); +console.log(item.title); // "Notebook" +console.log(exports.MyApp.Store.Item.State.Available); // "available" +item.release(); +another.release(); +``` + +The export paths contain neither `InternalStore` nor `InternalItem`. Generated TypeScript type references also use the renamed types. Swift paths remain `InternalStore.InternalItem` and `InternalStore.InternalItem.State`. + +The same exported paths are available under `globalThis` only when `exposeToGlobal: true` is enabled. Renaming does not enable global exports or turn instance-owned constructors into named JavaScript module exports. See for the distinction between a type name and a constructor value. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md index ebc9ac857..02f0a349d 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Importing-JavaScript/Importing-JS-Function.md @@ -89,6 +89,17 @@ let user: User = try parse(jsonString) // T inferred from the call site `T` can be any supported primitive, `String`, `JSValue`, or a `@JS` struct, `@JS` enum, or `final @JS class` (see ), used bare or wrapped as `[T]`, `T?`, or `[String: T]`. A function may declare multiple type parameters, and a return-only generic (`func make() -> T`) works too. Generic initializers, methods, and static methods on `@JSClass` types are supported the same way. `async` generic functions and `where` clauses are not supported. +Generic imports can also constrain `T` to `@JS` protocols, as in `T: BridgedSwiftGenericBridgeable & P & Q`. If `P` inherits `BridgedSwiftGenericBridgeable`, use `T: P`: + +```swift +import JavaScriptKit + +@JS protocol Named: BridgedSwiftGenericBridgeable { var name: String { get } } +@JSFunction func display(_ value: T) throws(JSException) +``` + +Constraints may use `@JS` protocols from dependency modules, including qualified names such as `T: BridgedSwiftGenericBridgeable & Models.Named`. Concrete conformers must expose the required members to JavaScript too, including marking methods with `@JS`. This does not enable existential compositions such as `any P & Q`; the generic-import limitations above still apply. + ## Supported features | Feature | Status | @@ -96,4 +107,5 @@ let user: User = try parse(jsonString) // T inferred from the call site | Primitive parameter/result types (e.g. `Double`, `Bool`) | ✅ | | `String` parameter/result type | ✅ | | Generic parameter/result types (constrained to `BridgedSwiftGenericBridgeable`) | ✅ | +| `@JS` protocol constraints on generic imports | ✅ | | Async function | ❌ | diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md index 4280a4637..b554e5a7b 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/JavaScript-Interop-Cheat-Sheet.md @@ -373,4 +373,5 @@ let swiftPromise = JSPromise.async { - Use `JSPromise.async(body:)` (with `Void` or `JSValue` return type) to expose Swift `async/await` work to JavaScript callers. - To await JavaScript `Promise` from Swift, import `JavaScriptEventLoop`, call `JavaScriptEventLoop.installGlobalExecutor()` early, and use the `value` property. - The `value` property suspends until the promise resolves or rejects, rethrowing rejections as ``JSException``. +- Long-running async work blocks rendering and input until it completes. Set `JavaScriptEventLoop.shared.yieldInterval` (for example, `.milliseconds(16)`) to yield to the JavaScript event loop between jobs. diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md index af9b0d2bd..b0b84469a 100644 --- a/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md +++ b/Sources/JavaScriptKit/Documentation.docc/Articles/Package-Output-Structure.md @@ -22,7 +22,8 @@ The output package has the following structure: ├── browser.js # Browser-specific platform setup ├── browser.d.ts # TypeScript definitions for browser.js ├── node.js # Node.js-specific platform setup - └── node.d.ts # TypeScript definitions for node.js + ├── node.d.ts # TypeScript definitions for node.js + └── uwasi.js # Shared uwasi adapter, when selected ``` ## Using the Package @@ -123,6 +124,20 @@ The `platforms/` directory contains platform-specific setup functions: - `platforms/browser.js` - Provides `defaultBrowserSetup()` for browser environments - `platforms/node.js` - Provides `defaultNodeSetup()` for Node.js environments +PackageToJS uses `@bjorn3/browser_wasi_shim` for WASI packages by default. Pass +`--wasi-runtime uwasi` to generate both platform wrappers against `uwasi`; this also +adds `platforms/uwasi.js` to the package. + +The `uwasi` wrappers import only the stdio, args, environ, clock, poll, proc and random +features, so file syscalls return `ENOSYS` and bundlers can drop `uwasi`'s file system. +With `--enable-code-coverage`, the Node wrapper adds an in-memory file system so the +test runner can read the coverage profile. To give an application a file system, pass +your own `wasi` object to `instantiate`. + +The browser main-thread setup rejects blocking `poll_oneoff` clock waits instead of +freezing the page. Run guests that require blocking waits in a worker. Node and browser +workers use `uwasi`'s blocking implementation. + ## Package Metadata (`package.json`) The generated `package.json` includes: @@ -143,6 +158,14 @@ The generated `package.json` includes: } ``` +With `--wasi-runtime uwasi`, the generated dependency is instead: + +```json +"dependencies": { + "uwasi": "1.5.2" +} +``` + The `exports` field allows importing the package as an npm dependency: ```javascript @@ -152,4 +175,3 @@ import { init } from '.build/plugins/PackageToJS/outputs/Package'; ## TypeScript Support All JavaScript files have corresponding `.d.ts` TypeScript definition files, providing full type safety when using the package in TypeScript projects. - diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift index a1cdc0c44..1e1b72dfb 100644 --- a/Sources/JavaScriptKit/Macros.swift +++ b/Sources/JavaScriptKit/Macros.swift @@ -50,7 +50,7 @@ public enum JSName: ExpressibleByStringLiteral { } } -/// A macro that exposes Swift functions, classes, and methods to JavaScript. +/// A macro that exposes Swift declarations to JavaScript and TypeScript. /// /// Apply this macro to Swift declarations that you want to make callable from JavaScript: /// @@ -138,9 +138,26 @@ public enum JSName: ExpressibleByStringLiteral { /// accessible from JavaScript, and TypeScript declaration files (`.d.ts`) will be /// automatically generated to provide type safety. /// +/// Use the first argument to choose a JavaScript and TypeScript name without changing +/// the Swift identifier: `@JS("Counter") class InternalCounter`. This also works on +/// structs, enums, and protocols. Generated type references use the chosen name, +/// including references in optional, array, and callback signatures. Nested exported +/// declarations inherit their enclosing types' exported names in their namespace paths. +/// For const-style enums, the chosen name is the stem of the generated `Values`, `Tag`, +/// and `Object` names. +/// +/// A renamed class constructor is still accessed through the WASM instance's exports +/// object, such as `exports.Counter`, not as a named JavaScript module export. +/// Renaming does not change bridging or memory-management semantics. In contrast, +/// `@JS(as: Other.self)` changes the JavaScript representation using conversion methods. +/// Combining a custom name with `as:` on the same declaration is not supported. +/// /// For detailed usage information, see the article . /// -/// - Parameter name: A different name to use in the exported JavaScript. +/// - Parameter name: A different JavaScript and TypeScript name for the exported declaration. +/// Does not rename the Swift declaration or change its representation. +/// - Parameter aliasOf: A different JavaScript representation, supplied as `as: Other.self`. +/// Requires `bridgeToJS()` and `bridgeFromJS(_:)` conversions and cannot be combined with `name`. /// - Parameter namespace: A dot-separated string that defines the namespace hierarchy in JavaScript. /// Each segment becomes a nested object in the resulting JavaScript structure. /// - Parameter enumStyle: Controls how enums are emitted to TypeScript for this declaration: diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift index 91638a428..dd2230ae2 100644 --- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift @@ -107,7 +107,8 @@ public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_get() -> @_cdecl("bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set") public func _bjs_GlobalStaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - GlobalStaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + GlobalStaticPropertyNamespace.namespaceProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -139,7 +140,8 @@ public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedPro @_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set") public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - GlobalStaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + GlobalStaticPropertyNamespace.NestedProperties.nestedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -171,7 +173,8 @@ public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDou @_cdecl("bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set") public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) - GlobalStaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + GlobalStaticPropertyNamespace.NestedProperties.nestedDouble = value #else fatalError("Only available on WebAssembly") #endif @@ -192,7 +195,9 @@ public func _bjs_GlobalNetworking_API_TestHTTPServer_init() -> UnsafeMutableRawP @_cdecl("bjs_GlobalNetworking_API_TestHTTPServer_call") public func _bjs_GlobalNetworking_API_TestHTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - GlobalNetworking.API.TestHTTPServer.bridgeJSLiftParameter(_self).call(_: GlobalNetworking.API.CallMethod.bridgeJSLiftParameter(method)) + let method = GlobalNetworking.API.CallMethod.bridgeJSLiftParameter(method) + let _self = GlobalNetworking.API.TestHTTPServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -244,7 +249,9 @@ public func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_init() -> Un @_cdecl("bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call") public func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Internal.TestInternalServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedServerMethod.bridgeJSLiftParameter(method)) + let method = Internal.SupportedServerMethod.bridgeJSLiftParameter(method) + let _self = Internal.TestInternalServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -296,7 +303,9 @@ public func _bjs_GlobalUtils_PublicConverter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_GlobalUtils_PublicConverter_toString") public func _bjs_GlobalUtils_PublicConverter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -307,7 +316,8 @@ public func _bjs_GlobalUtils_PublicConverter_toString(_ _self: UnsafeMutableRawP @_cdecl("bjs_GlobalUtils_PublicConverter_precision_get") public func _bjs_GlobalUtils_PublicConverter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).precision + let _self = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self) + let ret = _self.precision return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -318,7 +328,9 @@ public func _bjs_GlobalUtils_PublicConverter_precision_get(_ _self: UnsafeMutabl @_cdecl("bjs_GlobalUtils_PublicConverter_precision_set") public func _bjs_GlobalUtils_PublicConverter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self) + _self.precision = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSIdentityTests/Generated/BridgeJS.swift b/Tests/BridgeJSIdentityTests/Generated/BridgeJS.swift index 72a8dfdd4..6aa082880 100644 --- a/Tests/BridgeJSIdentityTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSIdentityTests/Generated/BridgeJS.swift @@ -75,7 +75,8 @@ public func _bjs_resetRetainLeakDeinits() -> Void { @_cdecl("bjs_setupArrayPool") public func _bjs_setupArrayPool(_ count: Int32) -> Void { #if arch(wasm32) - setupArrayPool(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + setupArrayPool(_: count) #else fatalError("Only available on WebAssembly") #endif @@ -96,7 +97,8 @@ public func _bjs_getArrayPool() -> Void { @_cdecl("bjs_getArrayPoolElement") public func _bjs_getArrayPoolElement(_ index: Int32) -> Void { #if arch(wasm32) - let ret = getArrayPoolElement(_: Int.bridgeJSLiftParameter(index)) + let index = Int.bridgeJSLiftParameter(index) + let ret = getArrayPoolElement(_: index) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -138,7 +140,8 @@ public func _bjs_clearArrayPool() -> Void { @_cdecl("bjs_IdentityTestSubject_init") public func _bjs_IdentityTestSubject_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = IdentityTestSubject(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = IdentityTestSubject(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -149,7 +152,8 @@ public func _bjs_IdentityTestSubject_init(_ value: Int32) -> UnsafeMutableRawPoi @_cdecl("bjs_IdentityTestSubject_value_get") public func _bjs_IdentityTestSubject_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = IdentityTestSubject.bridgeJSLiftParameter(_self).value + let _self = IdentityTestSubject.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -160,7 +164,9 @@ public func _bjs_IdentityTestSubject_value_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_IdentityTestSubject_value_set") public func _bjs_IdentityTestSubject_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - IdentityTestSubject.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = IdentityTestSubject.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -170,7 +176,8 @@ public func _bjs_IdentityTestSubject_value_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_IdentityTestSubject_currentValue_get") public func _bjs_IdentityTestSubject_currentValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = IdentityTestSubject.bridgeJSLiftParameter(_self).currentValue + let _self = IdentityTestSubject.bridgeJSLiftParameter(_self) + let ret = _self.currentValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -212,7 +219,8 @@ fileprivate func _bjs_IdentityTestSubject_wrap_extern(_ pointer: UnsafeMutableRa @_cdecl("bjs_RetainLeakSubject_init") public func _bjs_RetainLeakSubject_init(_ tag: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = RetainLeakSubject(tag: Int.bridgeJSLiftParameter(tag)) + let tag = Int.bridgeJSLiftParameter(tag) + let ret = RetainLeakSubject(tag: tag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -223,7 +231,8 @@ public func _bjs_RetainLeakSubject_init(_ tag: Int32) -> UnsafeMutableRawPointer @_cdecl("bjs_RetainLeakSubject_tag_get") public func _bjs_RetainLeakSubject_tag_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = RetainLeakSubject.bridgeJSLiftParameter(_self).tag + let _self = RetainLeakSubject.bridgeJSLiftParameter(_self) + let ret = _self.tag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -234,7 +243,9 @@ public func _bjs_RetainLeakSubject_tag_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_RetainLeakSubject_tag_set") public func _bjs_RetainLeakSubject_tag_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - RetainLeakSubject.bridgeJSLiftParameter(_self).tag = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = RetainLeakSubject.bridgeJSLiftParameter(_self) + _self.tag = value #else fatalError("Only available on WebAssembly") #endif @@ -275,7 +286,8 @@ fileprivate func _bjs_RetainLeakSubject_wrap_extern(_ pointer: UnsafeMutableRawP @_cdecl("bjs_ArrayIdentityElement_init") public func _bjs_ArrayIdentityElement_init(_ tag: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ArrayIdentityElement(tag: Int.bridgeJSLiftParameter(tag)) + let tag = Int.bridgeJSLiftParameter(tag) + let ret = ArrayIdentityElement(tag: tag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -286,7 +298,8 @@ public func _bjs_ArrayIdentityElement_init(_ tag: Int32) -> UnsafeMutableRawPoin @_cdecl("bjs_ArrayIdentityElement_tag_get") public func _bjs_ArrayIdentityElement_tag_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ArrayIdentityElement.bridgeJSLiftParameter(_self).tag + let _self = ArrayIdentityElement.bridgeJSLiftParameter(_self) + let ret = _self.tag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -297,7 +310,9 @@ public func _bjs_ArrayIdentityElement_tag_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_ArrayIdentityElement_tag_set") public func _bjs_ArrayIdentityElement_tag_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ArrayIdentityElement.bridgeJSLiftParameter(_self).tag = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = ArrayIdentityElement.bridgeJSLiftParameter(_self) + _self.tag = value #else fatalError("Only available on WebAssembly") #endif diff --git a/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift b/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift index 90c4b138e..3ff17cbfa 100644 --- a/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/ArraySupportTests.swift @@ -195,7 +195,7 @@ final class ArraySupportTests: XCTestCase { @JS static func roundTripStructArray(_ v: [DataPoint]) -> [DataPoint] { v } @JS static func roundTripSwiftClassArray(_ v: [Greeter]) -> [Greeter] { v } @JS static func roundTripNamespacedSwiftClassArray(_ v: [Utils.Converter]) -> [Utils.Converter] { v } - @JS static func roundTripProtocolArray(_ v: [ArrayElementProtocol]) -> [ArrayElementProtocol] { v } + @JS static func roundTripProtocolArray(_ v: [any ArrayElementProtocol]) -> [any ArrayElementProtocol] { v } @JS static func roundTripJSClassArray(_ v: [ArrayElementObject]) -> [ArrayElementObject] { v } @JS static func roundTripOptionalIntArray(_ v: [Int?]) -> [Int?] { v } diff --git a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift index a092d111c..17184c427 100644 --- a/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift +++ b/Tests/BridgeJSRuntimeTests/AsyncImportTests.swift @@ -24,6 +24,8 @@ import JavaScriptKit @JSFunction static func jsAsyncRoundTripOptionalAssociatedValueEnum( _ v: AsyncImportedPayloadResult? ) async throws(JSException) -> AsyncImportedPayloadResult? + @JSFunction static func jsAsyncThrowSynchronously(_ message: String) async throws(JSException) -> Double + @JSFunction static func jsAsyncReturnNonPromise(_ v: Double) async throws(JSException) -> Double } @Suite struct AsyncImportTests { @@ -104,6 +106,19 @@ import JavaScriptKit } } + // MARK: - Non-Promise behavior + + @Test func asyncSynchronousThrowRejects() async throws { + let error = await #expect(throws: JSException.self) { + try await AsyncImportImports.jsAsyncThrowSynchronously("SyncFailure") + } + #expect(error?.thrownValue.object?["message"].string == "SyncFailure") + } + + @Test func asyncNonPromiseReturnResolves() async throws { + try #expect(await AsyncImportImports.jsAsyncReturnNonPromise(42) == 42) + } + // MARK: - Structured return type @Test func fetchWeatherData() async throws { diff --git a/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift b/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift index 678981ede..12a5acca0 100644 --- a/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/ClosureAsyncAPIs.swift @@ -76,6 +76,14 @@ enum AsyncRecorderState { nonisolated(unsafe) static var lastRecorded: String = "" } +@JS func makeAsyncArraySum() -> JSTypedClosure<([Int]) async -> Int> { + JSTypedClosure { values in values.reduce(0, +) } +} + +@JS func awaitArraySum(_ sum: ([Int]) async -> Int) async -> Int { + await sum([1, 2, 3]) +} + // MARK: - XCTest entry point final class ClosureAsyncTests: XCTestCase { diff --git a/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift index 8078ed777..d6bb9c839 100644 --- a/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift +++ b/Tests/BridgeJSRuntimeTests/ClosureSupportTests.swift @@ -25,26 +25,26 @@ import JavaScriptKit _ value: JSObject, _ transform: JSTypedClosure<(JSObject) -> JSObject> ) throws(JSException) -> JSObject - // @JSFunction static func jsApplyArrayInt( - // _ value: [Int], - // _ transform: JSTypedClosure<([Int]) -> [Int]> - // ) throws(JSException) -> [Int] - // @JSFunction static func jsApplyArrayDouble( - // _ value: [Double], - // _ transform: JSTypedClosure<([Double]) -> [Double]> - // ) throws(JSException) -> [Double] - // @JSFunction static func jsApplyArrayString( - // _ value: [String], - // _ transform: JSTypedClosure<([String]) -> [String]> - // ) throws(JSException) -> [String] - // @JSFunction static func jsApplyArrayJSValue( - // _ value: [JSValue], - // _ transform: JSTypedClosure<([JSValue]) -> [JSValue]> - // ) throws(JSException) -> [JSValue] - // @JSFunction static func jsApplyArrayJSObject( - // _ value: [JSObject], - // _ transform: JSTypedClosure<([JSObject]) -> [JSObject]> - // ) throws(JSException) -> [JSObject] + @JSFunction static func jsApplyArrayInt( + _ value: [Int], + _ transform: JSTypedClosure<([Int]) -> [Int]> + ) throws(JSException) -> [Int] + @JSFunction static func jsApplyArrayDouble( + _ value: [Double], + _ transform: JSTypedClosure<([Double]) -> [Double]> + ) throws(JSException) -> [Double] + @JSFunction static func jsApplyArrayString( + _ value: [String], + _ transform: JSTypedClosure<([String]) -> [String]> + ) throws(JSException) -> [String] + @JSFunction static func jsApplyArrayJSValue( + _ value: [JSValue], + _ transform: JSTypedClosure<([JSValue]) -> [JSValue]> + ) throws(JSException) -> [JSValue] + @JSFunction static func jsApplyArrayJSObject( + _ value: [JSObject], + _ transform: JSTypedClosure<([JSObject]) -> [JSObject]> + ) throws(JSException) -> [JSObject] @JSFunction static func jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int @JSFunction static func jsMakeDoubleToDouble(_ base: Double) throws(JSException) -> (Double) -> Double @@ -85,6 +85,10 @@ import JavaScriptKit @JS static func makeJSStringToString(_ prefix: String) -> JSTypedClosure<(String) -> String> { return JSTypedClosure { prefix + $0 } } + + @JS static func makeArrayDifference() -> ([Int], [Int]) -> Int { + { first, second in first.reduce(0, +) - second.reduce(0, +) } + } } final class ClosureSupportTests: XCTestCase { @@ -148,43 +152,43 @@ final class ClosureSupportTests: XCTestCase { XCTAssertEqual(result, obj) } - // func testClosureParameterArrayIntToArrayInt() throws { - // let transform = JSTypedClosure<([Int]) -> [Int]> { $0 } - // defer { transform.release() } - // let result = try ClosureSupportImports.jsApplyArrayInt([1, 2, 3], transform) - // XCTAssertEqual(result, [1, 2, 3]) - // } + func testClosureParameterArrayIntToArrayInt() throws { + let transform = JSTypedClosure<([Int]) -> [Int]> { $0 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyArrayInt([1, 2, 3], transform) + XCTAssertEqual(result, [1, 2, 3]) + } - // func testClosureParameterArrayDoubleToArrayDouble() throws { - // let transform = JSTypedClosure<([Double]) -> [Double]> { $0 } - // defer { transform.release() } - // let result = try ClosureSupportImports.jsApplyArrayDouble([1.0, 2.0, 3.0], transform) - // XCTAssertEqual(result, [1.0, 2.0, 3.0]) - // } + func testClosureParameterArrayDoubleToArrayDouble() throws { + let transform = JSTypedClosure<([Double]) -> [Double]> { $0 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyArrayDouble([1.0, 2.0, 3.0], transform) + XCTAssertEqual(result, [1.0, 2.0, 3.0]) + } - // func testClosureParameterArrayStringToArrayString() throws { - // let transform = JSTypedClosure<([String]) -> [String]> { $0 } - // defer { transform.release() } - // let result = try ClosureSupportImports.jsApplyArrayString(["a", "b", "c"], transform) - // XCTAssertEqual(result, ["a", "b", "c"]) - // } + func testClosureParameterArrayStringToArrayString() throws { + let transform = JSTypedClosure<([String]) -> [String]> { $0 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyArrayString(["a", "b", "c"], transform) + XCTAssertEqual(result, ["a", "b", "c"]) + } - // func testClosureParameterArrayJSValueToArrayJSValue() throws { - // let transform = JSTypedClosure<([JSValue]) -> [JSValue]> { $0 } - // defer { transform.release() } - // let result = try ClosureSupportImports.jsApplyArrayJSValue([.number(1), .number(2), .number(3)], transform) - // XCTAssertEqual(result, [.number(1), .number(2), .number(3)]) - // } + func testClosureParameterArrayJSValueToArrayJSValue() throws { + let transform = JSTypedClosure<([JSValue]) -> [JSValue]> { $0 } + defer { transform.release() } + let result = try ClosureSupportImports.jsApplyArrayJSValue([.number(1), .number(2), .number(3)], transform) + XCTAssertEqual(result, [.number(1), .number(2), .number(3)]) + } - // func testClosureParameterArrayJSObjectToArrayJSObject() throws { - // let transform = JSTypedClosure<([JSObject]) -> [JSObject]> { $0 } - // defer { transform.release() } - // let obj1 = JSObject() - // let obj2 = JSObject() - // let obj3 = JSObject() - // let result = try ClosureSupportImports.jsApplyArrayJSObject([obj1, obj2, obj3], transform) - // XCTAssertEqual(result, [obj1, obj2, obj3]) - // } + func testClosureParameterArrayJSObjectToArrayJSObject() throws { + let transform = JSTypedClosure<([JSObject]) -> [JSObject]> { $0 } + defer { transform.release() } + let obj1 = JSObject() + let obj2 = JSObject() + let obj3 = JSObject() + let result = try ClosureSupportImports.jsApplyArrayJSObject([obj1, obj2, obj3], transform) + XCTAssertEqual(result, [obj1, obj2, obj3]) + } func testClosureReturnIntToInt() throws { let c = try ClosureSupportImports.jsMakeIntToInt(10) diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift index 8778c2c8e..a3e60711f 100644 --- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift @@ -22,6 +22,21 @@ func runJsWorks() -> Void @JS func roundTripString(v: String) -> String { return v } +@JS func describeReservedWordParameters(extension: Int, break: Double, function: Bool, in: String) -> String { + return "\(`extension`):\(`break`):\(function):\(`in`)" +} +@JS func describeBacktickedParameter(_ `in`: String) -> String { + return `in` +} +@JS func describeCollidingParameters(in: Int, _in: Int, instance: Int, swift: String) -> String { + return "\(`in`):\(_in):\(instance):\(swift)" +} +@JS protocol ReservedWordDescriber { + func describe(in: Int, for: String) -> String +} +@JS func describeWithReservedWordDescriber(_ describer: any ReservedWordDescriber) -> String { + return describer.describe(in: 1, for: "for") +} @JS func roundTripSwiftHeapObject(v: Greeter) -> Greeter { return v } @@ -58,6 +73,14 @@ func runJsWorks() -> Void return v } +@JS func makeJSValueString() -> JSValue { + return .string("makeJSValueString") +} + +@JS func makeJSValueObject() -> JSValue { + return .object(JSObject()) +} + @JS func roundTripOptionalJSValue(v: JSValue?) -> JSValue? { return v } @@ -95,6 +118,12 @@ struct TestError: Error { @JS func throwsWithDoubleResult() throws(JSException) -> Double { return 1.0 } @JS func throwsWithSwiftHeapObjectResult() throws(JSException) -> Greeter { return Greeter(name: "Test") } @JS func throwsWithJSObjectResult() throws(JSException) -> JSObject { return JSObject() } +@JS func throwsBeforeJSObjectResult() throws(JSException) -> JSObject { + throw JSException(JSError(message: "JSObjectResultError").jsValue) +} +@JS func throwsBeforeProtocolResult() throws(JSException) -> DataProcessor { + throw JSException(JSError(message: "ProtocolResultError").jsValue) +} @JS func zeroArgAsyncThrows() async throws(JSException) -> String { throw JSException(JSError(message: "ZeroArgAsyncThrowsError").jsValue) @@ -961,14 +990,18 @@ enum GraphOperations { func createOptionalGreeter() -> Greeter? func handleAPIResult(_ result: APIResult?) func getAPIResult() -> APIResult? + func validate(_ value: Int) throws(JSException) -> Int + func loadLabel(_ key: String) async throws(JSException) -> String + func reset() async throws(JSException) + func fetchCount() async -> Int } @JS class DataProcessorManager { @JS var processor: DataProcessor - @JS var backupProcessor: DataProcessor? + @JS var backupProcessor: (any DataProcessor)? - @JS init(processor: DataProcessor) { + @JS init(processor: any DataProcessor) { self.processor = processor self.backupProcessor = nil } @@ -1053,6 +1086,22 @@ enum GraphOperations { @JS func setProcessorAPIResult(_ apiResult: APIResult?) { processor.handleAPIResult(apiResult) } + + @JS func validateProcessorValue(_ value: Int) throws(JSException) -> Int { + return try processor.validate(value) + } + + @JS func loadProcessorLabel(_ key: String) async throws(JSException) -> String { + return try await processor.loadLabel(key) + } + + @JS func resetProcessor() async throws(JSException) { + try await processor.reset() + } + + @JS func fetchProcessorCount() async -> Int { + return await processor.fetchCount() + } } @JS class SwiftDataProcessor: DataProcessor { @@ -1117,6 +1166,25 @@ enum GraphOperations { @JS func getAPIResult() -> APIResult? { return apiResult } + + @JS func validate(_ value: Int) throws(JSException) -> Int { + guard value >= 0 else { + throw JSException(JSError(message: "SwiftDataProcessor rejects negative values").jsValue) + } + return value + } + + @JS func loadLabel(_ key: String) async throws(JSException) -> String { + return "\(label):\(key)" + } + + @JS func reset() async throws(JSException) { + count = 0 + } + + @JS func fetchCount() async -> Int { + return count + } } @JS class ProtocolReturnTests { @@ -1124,7 +1192,7 @@ enum GraphOperations { return SwiftDataProcessor() } - @JS static func createNativeProcessorOptional() -> DataProcessor? { + @JS static func createNativeProcessorOptional() -> (any DataProcessor)? { return SwiftDataProcessor() } @@ -1132,7 +1200,7 @@ enum GraphOperations { return nil } - @JS static func createNativeProcessorArray() -> [DataProcessor] { + @JS static func createNativeProcessorArray() -> [any DataProcessor] { let p1 = SwiftDataProcessor() p1.count = 10 let p2 = SwiftDataProcessor() @@ -1140,7 +1208,7 @@ enum GraphOperations { return [p1, p2] } - @JS static func createNativeProcessorDictionary() -> [String: DataProcessor] { + @JS static func createNativeProcessorDictionary() -> [String: any DataProcessor] { let p1 = SwiftDataProcessor() p1.count = 10 let p2 = SwiftDataProcessor() @@ -1317,12 +1385,12 @@ enum GraphOperations { } @JS func roundtripDataProcessor( - _ callback: @escaping (DataProcessor) -> DataProcessor - ) -> (DataProcessor) -> DataProcessor { + _ callback: @escaping (any DataProcessor) -> any DataProcessor + ) -> (any DataProcessor) -> any DataProcessor { return callback } - @JS func processOptionalDataProcessor(_ callback: (DataProcessor?) -> String) -> String { + @JS func processOptionalDataProcessor(_ callback: ((any DataProcessor)?) -> String) -> String { let processor = SwiftDataProcessor() processor.increment(by: 7) return callback(processor) + " | " + callback(nil) diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift index f16bce9f2..8bfe460fc 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift +++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift @@ -63,9 +63,10 @@ extension JSTypedClosure where Signature == (HttpStatus) -> Int { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests10HttpStatusO_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = HttpStatus.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(HttpStatus) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(HttpStatus.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -100,7 +101,7 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessor let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let param0ObjectId = _bridgeJSUnwrapProtocolExportable(param0, "DataProcessor").bridgeJSLowerAsProtocolReturn() let callbackValue = callback.bridgeJSLowerParameter() let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP(callbackValue, param0ObjectId) return AnyDataProcessor.bridgeJSLiftReturn(ret) @@ -126,9 +127,10 @@ extension JSTypedClosure where Signature == (any DataProcessor) -> any DataProce @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = AnyDataProcessor.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(any DataProcessor) -> any DataProcessor>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(AnyDataProcessor.bridgeJSLiftParameter(param0)) - return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let ret = _bridgeJSUnwrapProtocolExportable(closure(param0), "DataProcessor") + return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") #endif @@ -163,7 +165,7 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0ObjectId = (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let param0ObjectId = _bridgeJSUnwrapProtocolExportable(param0, "DataProcessor").bridgeJSLowerAsProtocolReturn() let callbackValue = callback.bridgeJSLowerParameter() let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_SS(callbackValue, param0ObjectId) return String.bridgeJSLiftReturn(ret) @@ -189,9 +191,10 @@ extension JSTypedClosure where Signature == (any DataProcessor) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13DataProcessorP_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = AnyDataProcessor.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(any DataProcessor) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(AnyDataProcessor.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -199,14 +202,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests13D #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -226,9 +229,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -255,9 +258,10 @@ extension JSTypedClosure where Signature == (Theme) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Theme.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -265,14 +269,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5Th #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -292,9 +296,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -321,9 +325,10 @@ extension JSTypedClosure where Signature == (Theme) -> Bool { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests5ThemeO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = Theme.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Theme) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Theme.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -384,9 +389,10 @@ extension JSTypedClosure where Signature == (Greeter) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Greeter.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Greeter) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Greeter.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -447,9 +453,10 @@ extension JSTypedClosure where Signature == (JSObject) -> JSObject { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8JSObjectC_8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = JSObject.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(JSObject) -> JSObject>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(JSObject.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -510,9 +517,10 @@ extension JSTypedClosure where Signature == (Vector2D) -> Vector2D { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Vector2D.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(Vector2D) -> Vector2D>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Vector2D.bridgeJSLiftParameter()) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -572,8 +580,9 @@ extension JSTypedClosure where Signature == (Vector2D) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests8Vector2DV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Vector2D.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(Vector2D) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Vector2D.bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -634,9 +643,10 @@ extension JSTypedClosure where Signature == (APIResult) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = APIResult.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(APIResult) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(APIResult.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -697,9 +707,10 @@ extension JSTypedClosure where Signature == (Direction) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = Direction.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Direction.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -760,9 +771,10 @@ extension JSTypedClosure where Signature == (Direction) -> Bool { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTests9DirectionO_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Direction.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Direction) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Direction.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -823,9 +835,10 @@ extension JSTypedClosure where Signature == (Polygon) -> Int { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7Polygon_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) + let param0 = Polygon.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Polygon) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Polygon.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -833,14 +846,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsAl7 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -860,9 +873,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsKSS_Sb { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] (param0: String) throws(JSException) -> Bool in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -892,10 +905,11 @@ extension JSTypedClosure where Signature == (String) throws(JSException) -> Bool @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Sb(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure do { - let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = try closure(param0) + return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -916,14 +930,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -943,9 +957,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsKSS_Si { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] (param0: String) throws(JSException) -> Int in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -975,10 +989,11 @@ extension JSTypedClosure where Signature == (String) throws(JSException) -> Int @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) throws(JSException) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure do { - let result = try closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = try closure(param0) + return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -999,14 +1014,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsKSS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> UnsafeMutableRawPointer #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> UnsafeMutableRawPointer { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1026,9 +1041,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_7GreeterC { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -1055,9 +1070,10 @@ extension JSTypedClosure where Signature == (String) -> Greeter { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_7GreeterC(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> Greeter>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1065,14 +1081,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_ #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1092,9 +1108,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callbackValue, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(callbackValue, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -1121,47 +1137,48 @@ extension JSTypedClosure where Signature == (String) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ callback: Int32, _ param0: Float64) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(callback, param0) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV { - static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Vector2D { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV { + static func bridgeJSLift(_ callbackId: Int32) -> ([JSValue]) -> [JSValue] { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0Value = param0.bridgeJSLowerParameter() + let _ = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(callbackValue, param0Value) - return Vector2D.bridgeJSLiftReturn() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV(callbackValue) + return [JSValue].bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1169,10 +1186,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV { } } -extension JSTypedClosure where Signature == (Double) -> Vector2D { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Vector2D) { +extension JSTypedClosure where Signature == ([JSValue]) -> [JSValue] { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([JSValue]) -> [JSValue]) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV, body: body, fileID: fileID, line: line @@ -1180,51 +1197,52 @@ extension JSTypedClosure where Signature == (Double) -> Vector2D { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Vector2D>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Double.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let param0 = [JSValue].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([JSValue]) -> [JSValue]>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(callback, param0) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd { - static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC { + static func bridgeJSLift(_ callbackId: Int32) -> ([JSObject]) -> [JSObject] { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0Value = param0.bridgeJSLowerParameter() + let _ = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(callbackValue, param0Value) - return Double.bridgeJSLiftReturn(ret) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC(callbackValue) + return [JSObject].bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1232,10 +1250,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd { } } -extension JSTypedClosure where Signature == (Double) -> Double { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Double) { +extension JSTypedClosure where Signature == ([JSObject]) -> [JSObject] { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([JSObject]) -> [JSObject]) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC, body: body, fileID: fileID, line: line @@ -1243,51 +1261,52 @@ extension JSTypedClosure where Signature == (Double) -> Double { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Float64 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Double>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Double.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let param0 = [JSObject].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([JSObject]) -> [JSObject]>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ callback: Int32, _ param0: Float64) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(callback, param0) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV { - static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Optional { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSaSS_SaSS { + static func bridgeJSLift(_ callbackId: Int32) -> ([String]) -> [String] { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let param0Value = param0.bridgeJSLowerParameter() + let _ = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(callbackValue, param0Value) - return Optional.bridgeJSLiftReturn() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS(callbackValue) + return [String].bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1295,10 +1314,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV { } } -extension JSTypedClosure where Signature == (Double) -> Optional { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Optional) { +extension JSTypedClosure where Signature == ([String]) -> [String] { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([String]) -> [String]) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS, body: body, fileID: fileID, line: line @@ -1306,56 +1325,52 @@ extension JSTypedClosure where Signature == (Double) -> Optional { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSS_SaSS(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Double.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let param0 = [String].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([String]) -> [String]>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(callback, param0, param1Bytes, param1Length, param2) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { - static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSaSd_SaSd { + static func bridgeJSLift(_ callbackId: Int32) -> ([Double]) -> [Double] { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] (param0, param1, param2) in + return { [callback] param0 in #if arch(wasm32) - let ret0 = param1.bridgeJSWithLoweredParameter { (param1Bytes, param1Length) in - let param2Value = param2.bridgeJSLowerParameter() - let param0Value = param0.bridgeJSLowerParameter() - let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callbackValue, param0Value, param1Bytes, param1Length, param2Value) - return ret - } - let ret = ret0 - return String.bridgeJSLiftReturn(ret) + let _ = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd(callbackValue) + return [Double].bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1363,10 +1378,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { } } -extension JSTypedClosure where Signature == (Int, String, Double) -> String { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, String, Double) -> String) { +extension JSTypedClosure where Signature == ([Double]) -> [Double] { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([Double]) -> [Double]) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd, body: body, fileID: fileID, line: line @@ -1374,52 +1389,52 @@ extension JSTypedClosure where Signature == (Int, String, Double) -> String { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSd_SaSd(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, String, Double) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0), String.bridgeJSLiftParameter(param1Bytes, param1Length), Double.bridgeJSLiftParameter(param2)) - return result.bridgeJSLowerReturn() + let param0 = [Double].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([Double]) -> [Double]>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(_ callback: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(_ callback: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(callback, param0, param1, param2) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si(_ callback: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { - static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int, Int) -> Int { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSaSiSaSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> ([Int], [Int]) -> Int { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] (param0, param1, param2) in + return { [callback] (param0, param1) in #if arch(wasm32) - let param2Value = param2.bridgeJSLowerParameter() - let param1Value = param1.bridgeJSLowerParameter() - let param0Value = param0.bridgeJSLowerParameter() + let _ = param1.bridgeJSLowerParameter() + let _ = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(callbackValue, param0Value, param1Value, param2Value) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si(callbackValue) return Int.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") @@ -1428,10 +1443,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { } } -extension JSTypedClosure where Signature == (Int, Int, Int) -> Int { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int, Int) -> Int) { +extension JSTypedClosure where Signature == ([Int], [Int]) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([Int], [Int]) -> Int) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si, body: body, fileID: fileID, line: line @@ -1439,52 +1454,53 @@ extension JSTypedClosure where Signature == (Int, Int, Int) -> Int { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSiSaSi_Si(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0), Int.bridgeJSLiftParameter(param1), Int.bridgeJSLiftParameter(param2)) - return result.bridgeJSLowerReturn() + let param1 = [Int].bridgeJSStackPop() + let param0 = [Int].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([Int], [Int]) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0, param1) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(_ callback: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(_ callback: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(callback, param0, param1) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi(_ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(callback) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { - static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int) -> Int { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSaSi_SaSi { + static func bridgeJSLift(_ callbackId: Int32) -> ([Int]) -> [Int] { let callback = JSObject.bridgeJSLiftParameter(callbackId) - return { [callback] (param0, param1) in + return { [callback] param0 in #if arch(wasm32) - let param1Value = param1.bridgeJSLowerParameter() - let param0Value = param0.bridgeJSLowerParameter() + let _ = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(callbackValue, param0Value, param1Value) - return Int.bridgeJSLiftReturn(ret) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi(callbackValue) + return [Int].bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1492,10 +1508,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { } } -extension JSTypedClosure where Signature == (Int, Int) -> Int { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int) -> Int) { +extension JSTypedClosure where Signature == ([Int]) -> [Int] { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([Int]) -> [Int]) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi, body: body, fileID: fileID, line: line @@ -1503,51 +1519,52 @@ extension JSTypedClosure where Signature == (Int, Int) -> Int { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSaSi_SaSi(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0), Int.bridgeJSLiftParameter(param1)) - return result.bridgeJSLowerReturn() + let param0 = [Int].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([Int]) -> [Int]>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(callback, param0) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ callback: Int32, _ param0: Float64) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(callback, param0) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { - static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV { + static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Vector2D { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let param0Value = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callbackValue, param0Value) - return Int.bridgeJSLiftReturn(ret) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(callbackValue, param0Value) + return Vector2D.bridgeJSLiftReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1555,10 +1572,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { } } -extension JSTypedClosure where Signature == (Int) -> Int { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Int) { +extension JSTypedClosure where Signature == (Double) -> Vector2D { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Vector2D) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV, body: body, fileID: fileID, line: line @@ -1566,50 +1583,52 @@ extension JSTypedClosure where Signature == (Int) -> Int { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Int.bridgeJSLiftParameter(param0)) - return result.bridgeJSLowerReturn() + let param0 = Double.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Vector2D>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ callback: Int32, _ param0: Float64) -> Float64 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(callback, param0) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ callback: Int32, _ param0: Float64) -> Float64 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(callback, param0) } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 #else -fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { - return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(boxPtr, file, line) +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd_extern(boxPtr, file, line) } -private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { - static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Void { +private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sd { + static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Double { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) let param0Value = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(callbackValue, param0Value) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(callbackValue, param0Value) + return Double.bridgeJSLiftReturn(ret) #else fatalError("Only available on WebAssembly") #endif @@ -1617,10 +1636,10 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { } } -extension JSTypedClosure where Signature == (Int) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Void) { +extension JSTypedClosure where Signature == (Double) -> Double { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Double) { self.init( - makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y, + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd, body: body, fileID: fileID, line: line @@ -1628,20 +1647,417 @@ extension JSTypedClosure where Signature == (Int) -> Void { } } -@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") -public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sd(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Float64 { #if arch(wasm32) - let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Int.bridgeJSLiftParameter(param0)) + let param0 = Double.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Double>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0ObjectId: Int32) -> Int32 +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ callback: Int32, _ param0: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ callback: Int32, _ param0: Float64) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV { + static func bridgeJSLift(_ callbackId: Int32) -> (Double) -> Optional { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(callbackValue, param0Value) + return Optional.bridgeJSLiftReturn() + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Double) -> Optional { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Double) -> Optional) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSd_Sq8Vector2DV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { + #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1Word0: Int32, _ param1Word1: Int32, _ param1Word2: Int32, _ param2: Float64) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ callback: Int32, _ param0: Int32, _ param1Word0: Int32, _ param1Word1: Int32, _ param1Word2: Int32, _ param2: Float64) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ callback: Int32, _ param0: Int32, _ param1Word0: Int32, _ param1Word1: Int32, _ param1Word2: Int32, _ param2: Float64) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(callback, param0, param1Word0, param1Word1, param1Word2, param2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS { + static func bridgeJSLift(_ callbackId: Int32) -> (Int, String, Double) -> String { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] (param0, param1, param2) in + #if arch(wasm32) + let ret0 = param1.bridgeJSWithLoweredParameter { (param1Word0, param1Word1, param1Word2) in + let param2Value = param2.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(callbackValue, param0Value, param1Word0, param1Word1, param1Word2, param2Value) + return ret + } + let ret = ret0 + return String.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int, String, Double) -> String { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, String, Double) -> String) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSSSd_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1Bytes: Int32, _ param1Length: Int32, _ param2: Float64) -> Void { + #if arch(wasm32) + let param2 = Double.bridgeJSLiftParameter(param2) + let param1 = String.bridgeJSLiftParameter(param1Bytes, param1Length) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, String, Double) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0, param1, param2) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(callback, param0, param1, param2) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSiSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int, Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] (param0, param1, param2) in + #if arch(wasm32) + let param2Value = param2.bridgeJSLowerParameter() + let param1Value = param1.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(callbackValue, param0Value, param1Value, param2Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int, Int, Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int, Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32, _ param2: Int32) -> Int32 { + #if arch(wasm32) + let param2 = Int.bridgeJSLiftParameter(param2) + let param1 = Int.bridgeJSLiftParameter(param1) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0, param1, param2) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ callback: Int32, _ param0: Int32, _ param1: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(callback, param0, param1) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSiSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int, Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] (param0, param1) in + #if arch(wasm32) + let param1Value = param1.bridgeJSLowerParameter() + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(callbackValue, param0Value, param1Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int, Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int, Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSiSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32, _ param1: Int32) -> Int32 { + #if arch(wasm32) + let param1 = Int.bridgeJSLiftParameter(param1) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int, Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0, param1) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ callback: Int32, _ param0: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ callback: Int32, _ param0: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(callbackValue, param0Value) + return Int.bridgeJSLiftReturn(ret) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int) -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { + #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + let ret = closure(param0) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ callback: Int32, _ param0: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsSi_y { + static func bridgeJSLift(_ callbackId: Int32) -> (Int) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(callbackValue, param0Value) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (Int) -> Void { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (Int) -> Void) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { + #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0ObjectId: Int32) -> Int32 #else fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0ObjectId: Int32) -> Int32 { fatalError("Only available on WebAssembly") @@ -1670,7 +2086,7 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS { #if arch(wasm32) let (param0IsSome, param0ObjectId): (Int32, Int32) if let param0 { - (param0IsSome, param0ObjectId) = (1, (param0 as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + (param0IsSome, param0ObjectId) = (1, _bridgeJSUnwrapProtocolExportable(param0, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } else { (param0IsSome, param0ObjectId) = (0, 0) } @@ -1699,9 +2115,10 @@ extension JSTypedClosure where Signature == (Optional) -> Str @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq13DataProcessorP_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1709,14 +2126,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq1 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(callback, param0IsSome, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS_extern(callback, param0IsSome, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -1736,9 +2153,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callbackValue, param0IsSome, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(callbackValue, param0IsSome, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -1765,9 +2182,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq5ThemeO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1828,9 +2246,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq7GreeterC_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1891,9 +2310,10 @@ extension JSTypedClosure where Signature == (Optional) -> Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -1954,9 +2374,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9APIResultO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0CaseId: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -2017,9 +2438,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9DirectionO_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -2027,14 +2449,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSq9 #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(callback, param0IsSome, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Int32 { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS_extern(callback, param0IsSome, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2054,9 +2476,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in + let ret0 = param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callbackValue, param0IsSome, param0Bytes, param0Length) + let ret = invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(callbackValue, param0IsSome, param0Word0, param0Word1, param0Word2) return ret } let ret = ret0 @@ -2083,9 +2505,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -2146,9 +2569,10 @@ extension JSTypedClosure where Signature == (Optional) -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqSi_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Optional) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) - return result.bridgeJSLowerReturn() + let ret = closure(param0) + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -2156,14 +2580,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsSqS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2184,13 +2608,13 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_SS { return { [callback] (param0: String) async throws(JSException) -> String in #if arch(wasm32) let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -2216,9 +2640,10 @@ extension JSTypedClosure where Signature == (String) async throws(JSException) - @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in - return try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -2227,14 +2652,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaK #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2257,11 +2682,11 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_y { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } #else @@ -2286,9 +2711,10 @@ extension JSTypedClosure where Signature == (String) async throws(JSException) - @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async throws(JSException) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) in - try await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) -> Void in + try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -2325,9 +2751,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO { return { [callback] (param0: Bool) async throws(JSException) -> AsyncPayloadResult in #if arch(wasm32) let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending AsyncPayloadResult) -> Void>($0) + JSTypedClosure<(sending AsyncPayloadResult) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let param0Value = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() @@ -2356,9 +2782,10 @@ extension JSTypedClosure where Signature == (Bool) async throws(JSException) -> @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Int32 { #if arch(wasm32) + let param0 = Bool.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Bool) async throws(JSException) -> AsyncPayloadResult>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) { () async throws(JSException) -> AsyncPayloadResult in - return try await closure(Bool.bridgeJSLiftParameter(param0)) + return try await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -2367,14 +2794,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaK #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(resolveRef, rejectRef, callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS_extern(resolveRef, rejectRef, callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2395,13 +2822,13 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsYaSS_SS { return { [callback] (param0: String) async -> String in #if arch(wasm32) let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(resolveRef, rejectRef, callbackValue, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(resolveRef, rejectRef, callbackValue, param0Word0, param0Word1, param0Word2) } } return resolved @@ -2427,9 +2854,81 @@ extension JSTypedClosure where Signature == (String) async -> String { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSS_SS(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Int32 { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(String) async -> String>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { - return await closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + return await closure(param0) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si(_ resolveRef: Int32, _ rejectRef: Int32, _ callback: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(resolveRef, rejectRef, callback) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestsYaSaSi_Si { + static func bridgeJSLift(_ callbackId: Int32) -> ([Int]) async -> Int { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] (param0: [Int]) async -> Int in + #if arch(wasm32) + let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { + JSTypedClosure<(sending Int) -> Void>.sending($0) + }, makeRejectClosure: { + JSTypedClosure<(sending JSValue) -> Void>.sending($0) + }) { resolveRef, rejectRef in + let _ = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si(resolveRef, rejectRef, callbackValue) + } + return resolved + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == ([Int]) async -> Int { + init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping ([Int]) async -> Int) { + self.init( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSaSi_Si(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let param0 = [Int].bridgeJSStackPop() + let closure = Unmanaged<_BridgeJSTypedClosureBox<([Int]) async -> Int>>.fromOpaque(boxPtr).takeUnretainedValue().closure + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -2466,9 +2965,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestsYaSd_9DataPointV { return { [callback] (param0: Double) async -> DataPoint in #if arch(wasm32) let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending DataPoint) -> Void>($0) + JSTypedClosure<(sending DataPoint) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let param0Value = param0.bridgeJSLowerParameter() let callbackValue = callback.bridgeJSLowerParameter() @@ -2497,9 +2996,10 @@ extension JSTypedClosure where Signature == (Double) async -> DataPoint { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaSd_9DataPointV(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Int32 { #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(Double) async -> DataPoint>>.fromOpaque(boxPtr).takeUnretainedValue().closure return _bjs_makePromise(resolve: Promise_resolve_9DataPointV, reject: Promise_reject) { - return await closure(Double.bridgeJSLiftParameter(param0)) + return await closure(param0) } #else fatalError("Only available on WebAssembly") @@ -2508,14 +3008,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsYaS #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2535,9 +3035,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss11FeatureFlagO_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(callbackValue, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(callbackValue, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -2547,8 +3047,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss11FeatureFlagO_y { } extension JSTypedClosure where Signature == (sending FeatureFlag) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending FeatureFlag) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending FeatureFlag) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y, body: body, fileID: fileID, @@ -2561,8 +3061,9 @@ extension JSTypedClosure where Signature == (sending FeatureFlag) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11FeatureFlagO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = FeatureFlag.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending FeatureFlag) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(FeatureFlag.bridgeJSLiftParameter(param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2608,8 +3109,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss11WeatherDataC_y { } extension JSTypedClosure where Signature == (sending WeatherData) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending WeatherData) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending WeatherData) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y, body: body, fileID: fileID, @@ -2622,8 +3123,9 @@ extension JSTypedClosure where Signature == (sending WeatherData) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss11WeatherDataC_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = WeatherData.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending WeatherData) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(WeatherData.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2669,8 +3171,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y { } extension JSTypedClosure where Signature == (sending AsyncPayloadResult) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncPayloadResult) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncPayloadResult) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y, body: body, fileID: fileID, @@ -2683,8 +3185,9 @@ extension JSTypedClosure where Signature == (sending AsyncPayloadResult) -> Void @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss18AsyncPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = AsyncPayloadResult.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending AsyncPayloadResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(AsyncPayloadResult.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2730,8 +3233,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y } extension JSTypedClosure where Signature == (sending AsyncImportedPayloadResult) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncImportedPayloadResult) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending AsyncImportedPayloadResult) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y, body: body, fileID: fileID, @@ -2744,8 +3247,9 @@ extension JSTypedClosure where Signature == (sending AsyncImportedPayloadResult) @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss26AsyncImportedPayloadResultO_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = AsyncImportedPayloadResult.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending AsyncImportedPayloadResult) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(AsyncImportedPayloadResult.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2791,8 +3295,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss7JSValueV_y { } extension JSTypedClosure where Signature == (sending JSValue) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending JSValue) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y, body: body, fileID: fileID, @@ -2805,8 +3309,9 @@ extension JSTypedClosure where Signature == (sending JSValue) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss7JSValueV_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Kind: Int32, _ param0Payload1: Int32, _ param0Payload2: Float64) -> Void { #if arch(wasm32) + let param0 = JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending JSValue) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(JSValue.bridgeJSLiftParameter(param0Kind, param0Payload1, param0Payload2)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2852,8 +3357,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestss9DataPointV_y { } extension JSTypedClosure where Signature == (sending DataPoint) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending DataPoint) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending DataPoint) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y, body: body, fileID: fileID, @@ -2866,8 +3371,9 @@ extension JSTypedClosure where Signature == (sending DataPoint) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9DataPointV_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = DataPoint.bridgeJSLiftParameter() let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending DataPoint) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(DataPoint.bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2875,14 +3381,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestss9D #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ callback: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(callback, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ callback: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y_extern(callback, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -2902,9 +3408,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSS_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(callbackValue, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(callbackValue, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -2914,8 +3420,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSS_y { } extension JSTypedClosure where Signature == (sending String) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending String) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y, body: body, fileID: fileID, @@ -2928,8 +3434,9 @@ extension JSTypedClosure where Signature == (sending String) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = String.bridgeJSLiftParameter(param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending String) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(String.bridgeJSLiftParameter(param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -2975,8 +3482,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSS_y { } extension JSTypedClosure where Signature == (sending [String]) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [String]) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [String]) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y, body: body, fileID: fileID, @@ -2989,8 +3496,9 @@ extension JSTypedClosure where Signature == (sending [String]) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSS_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = [String].bridgeJSStackPop() let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [String]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure([String].bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3036,8 +3544,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSb_y { } extension JSTypedClosure where Signature == (sending [Bool]) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Bool]) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Bool]) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y, body: body, fileID: fileID, @@ -3050,8 +3558,9 @@ extension JSTypedClosure where Signature == (sending [Bool]) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSb_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = [Bool].bridgeJSStackPop() let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Bool]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure([Bool].bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3097,8 +3606,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSaSd_y { } extension JSTypedClosure where Signature == (sending [Double]) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Double]) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending [Double]) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y, body: body, fileID: fileID, @@ -3111,8 +3620,9 @@ extension JSTypedClosure where Signature == (sending [Double]) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSaSd_y(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) + let param0 = [Double].bridgeJSStackPop() let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending [Double]) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure([Double].bridgeJSLiftParameter()) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3158,8 +3668,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSb_y { } extension JSTypedClosure where Signature == (sending Bool) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Bool) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y, body: body, fileID: fileID, @@ -3172,8 +3682,9 @@ extension JSTypedClosure where Signature == (sending Bool) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSb_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { #if arch(wasm32) + let param0 = Bool.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Bool) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Bool.bridgeJSLiftParameter(param0)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3219,8 +3730,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSd_y { } extension JSTypedClosure where Signature == (sending Double) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Double) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y, body: body, fileID: fileID, @@ -3233,8 +3744,71 @@ extension JSTypedClosure where Signature == (sending Double) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Float64) -> Void { #if arch(wasm32) + let param0 = Double.bridgeJSLiftParameter(param0) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Double) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Double.bridgeJSLiftParameter(param0)) + closure(param0) + #else + fatalError("Only available on WebAssembly") + #endif +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y") +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void +#else +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(_ callback: Int32, _ param0: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y(_ callback: Int32, _ param0: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(callback, param0) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y") +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 +#else +fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y(_ boxPtr: UnsafeMutableRawPointer, _ file: UnsafePointer, _ line: UInt32) -> Int32 { + return make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y_extern(boxPtr, file, line) +} + +private enum _BJS_Closure_20BridgeJSRuntimeTestssSi_y { + static func bridgeJSLift(_ callbackId: Int32) -> (sending Int) -> Void { + let callback = JSObject.bridgeJSLiftParameter(callbackId) + return { [callback] param0 in + #if arch(wasm32) + let param0Value = param0.bridgeJSLowerParameter() + let callbackValue = callback.bridgeJSLowerParameter() + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y(callbackValue, param0Value) + #else + fatalError("Only available on WebAssembly") + #endif + } + } +} + +extension JSTypedClosure where Signature == (sending Int) -> Void { + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Int) -> Void) -> Self { + Self( + makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y, + body: body, + fileID: fileID, + line: line + ) + } +} + +@_expose(wasm, "invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y") +@_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y") +public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSi_y(_ boxPtr: UnsafeMutableRawPointer, _ param0: Int32) -> Void { + #if arch(wasm32) + let param0 = Int.bridgeJSLiftParameter(param0) + let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Int) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3280,8 +3854,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO } extension JSTypedClosure where Signature == (sending Optional) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq26AsyncImportedPayloadResultO_y, body: body, fileID: fileID, @@ -3294,8 +3868,9 @@ extension JSTypedClosure where Signature == (sending Optional Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Optional.bridgeJSLiftParameter(param0IsSome, param0CaseId)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3303,14 +3878,14 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSq #if arch(wasm32) @_extern(wasm, module: "bjs", name: "invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y") -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void #else -fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { +fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { - return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(callback, param0IsSome, param0Bytes, param0Length) +@inline(never) fileprivate func invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ callback: Int32, _ param0IsSome: Int32, _ param0Word0: Int32, _ param0Word1: Int32, _ param0Word2: Int32) -> Void { + return invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y_extern(callback, param0IsSome, param0Word0, param0Word1, param0Word2) } #if arch(wasm32) @@ -3330,9 +3905,9 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSS_y { let callback = JSObject.bridgeJSLiftParameter(callbackId) return { [callback] param0 in #if arch(wasm32) - param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Bytes, param0Length) in + param0.bridgeJSWithLoweredParameter { (param0IsSome, param0Word0, param0Word1, param0Word2) in let callbackValue = callback.bridgeJSLowerParameter() - invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(callbackValue, param0IsSome, param0Bytes, param0Length) + invoke_js_callback_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(callbackValue, param0IsSome, param0Word0, param0Word1, param0Word2) } #else fatalError("Only available on WebAssembly") @@ -3342,8 +3917,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSS_y { } extension JSTypedClosure where Signature == (sending Optional) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y, body: body, fileID: fileID, @@ -3356,8 +3931,9 @@ extension JSTypedClosure where Signature == (sending Optional) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSS_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Bytes: Int32, _ param0Length: Int32) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Bytes, param0Length)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3403,8 +3979,8 @@ private enum _BJS_Closure_20BridgeJSRuntimeTestssSqSd_y { } extension JSTypedClosure where Signature == (sending Optional) -> Void { - init(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) { - self.init( + static func sending(fileID: StaticString = #fileID, line: UInt32 = #line, _ body: @escaping (sending Optional) -> Void) -> Self { + Self( makeClosure: make_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y, body: body, fileID: fileID, @@ -3417,8 +3993,9 @@ extension JSTypedClosure where Signature == (sending Optional) -> Void { @_cdecl("invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y") public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestssSqSd_y(_ boxPtr: UnsafeMutableRawPointer, _ param0IsSome: Int32, _ param0Value: Float64) -> Void { #if arch(wasm32) + let param0 = Optional.bridgeJSLiftParameter(param0IsSome, param0Value) let closure = Unmanaged<_BridgeJSTypedClosureBox<(sending Optional) -> Void>>.fromOpaque(boxPtr).takeUnretainedValue().closure - closure(Optional.bridgeJSLiftParameter(param0IsSome, param0Value)) + closure(param0) #else fatalError("Only available on WebAssembly") #endif @@ -3479,8 +4056,8 @@ extension JSTypedClosure where Signature == () -> any DataProcessor { public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_13DataProcessorP(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> any DataProcessor>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure() - return (result as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn() + let ret = _bridgeJSUnwrapProtocolExportable(closure(), "DataProcessor") + return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") #endif @@ -3541,8 +4118,8 @@ extension JSTypedClosure where Signature == () -> Bool { public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sb(_ boxPtr: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Bool>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure() - return result.bridgeJSLowerReturn() + let ret = closure() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -3603,8 +4180,8 @@ extension JSTypedClosure where Signature == () -> Optional { public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_Sq7GreeterC(_ boxPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) let closure = Unmanaged<_BridgeJSTypedClosureBox<() -> Optional>>.fromOpaque(boxPtr).takeUnretainedValue().closure - let result = closure() - return result.bridgeJSLowerReturn() + let ret = closure() + return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif @@ -3670,9 +4247,7 @@ public func _invoke_swift_closure_BridgeJSRuntimeTests_20BridgeJSRuntimeTestsy_y #endif } -struct AnyArrayElementProtocol: ArrayElementProtocol, _BridgedSwiftProtocolWrapper { - let jsObject: JSObject - +extension ArrayElementProtocol where Self: _BridgedSwiftProtocolWrapper { var value: Int { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -3685,6 +4260,10 @@ struct AnyArrayElementProtocol: ArrayElementProtocol, _BridgedSwiftProtocolWrapp bjs_ArrayElementProtocol_value_set(jsObjectValue, newValueValue) } } +} + +struct AnyArrayElementProtocol: ArrayElementProtocol, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyArrayElementProtocol(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -3715,80 +4294,144 @@ fileprivate func bjs_ArrayElementProtocol_value_set_extern(_ jsObject: Int32, _ return bjs_ArrayElementProtocol_value_set_extern(jsObject, newValue) } -struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { +extension ReservedWordDescriber where Self: _BridgedSwiftProtocolWrapper { + func describe(`in`: Int, `for`: String) -> String { + let ret0 = `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let inValue = `in`.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_ReservedWordDescriber_describe(jsObjectValue, inValue, forWord0, forWord1, forWord2) + return ret + } + let ret = ret0 + return String.bridgeJSLiftReturn(ret) + } +} + +struct AnyReservedWordDescriber: ReservedWordDescriber, _BridgedSwiftProtocolWrapper { let jsObject: JSObject + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyReservedWordDescriber(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ReservedWordDescriber_describe") +fileprivate func bjs_ReservedWordDescriber_describe_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 +#else +fileprivate func bjs_ReservedWordDescriber_describe_extern(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ReservedWordDescriber_describe(_ jsObject: Int32, _ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32) -> Int32 { + return bjs_ReservedWordDescriber_describe_extern(jsObject, `in`, forWord0, forWord1, forWord2) +} + +extension DataProcessor where Self: _BridgedSwiftProtocolWrapper { func increment(by amount: Int) -> Void { let amountValue = amount.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_increment(jsObjectValue, amountValue) + bjs_DataProcessor_increment(jsObjectValue, amountValue) } func getValue() -> Int { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_getValue(jsObjectValue) + let ret = bjs_DataProcessor_getValue(jsObjectValue) return Int.bridgeJSLiftReturn(ret) } func setLabelElements(_ labelPrefix: String, _ labelSuffix: String) -> Void { - labelPrefix.bridgeJSWithLoweredParameter { (labelPrefixBytes, labelPrefixLength) in - labelSuffix.bridgeJSWithLoweredParameter { (labelSuffixBytes, labelSuffixLength) in + labelPrefix.bridgeJSWithLoweredParameter { (labelPrefixWord0, labelPrefixWord1, labelPrefixWord2) in + labelSuffix.bridgeJSWithLoweredParameter { (labelSuffixWord0, labelSuffixWord1, labelSuffixWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_setLabelElements(jsObjectValue, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength) + bjs_DataProcessor_setLabelElements(jsObjectValue, labelPrefixWord0, labelPrefixWord1, labelPrefixWord2, labelSuffixWord0, labelSuffixWord1, labelSuffixWord2) } } } func getLabel() -> String { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_getLabel(jsObjectValue) + let ret = bjs_DataProcessor_getLabel(jsObjectValue) return String.bridgeJSLiftReturn(ret) } func isEven() -> Bool { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_isEven(jsObjectValue) + let ret = bjs_DataProcessor_isEven(jsObjectValue) return Bool.bridgeJSLiftReturn(ret) } func processGreeter(_ greeter: Greeter) -> String { let greeterPointer = greeter.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_processGreeter(jsObjectValue, greeterPointer) + let ret = bjs_DataProcessor_processGreeter(jsObjectValue, greeterPointer) return String.bridgeJSLiftReturn(ret) } func createGreeter() -> Greeter { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_createGreeter(jsObjectValue) + let ret = bjs_DataProcessor_createGreeter(jsObjectValue) return Greeter.bridgeJSLiftReturn(ret) } func processOptionalGreeter(_ greeter: Optional) -> String { let (greeterIsSome, greeterPointer) = greeter.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer) + let ret = bjs_DataProcessor_processOptionalGreeter(jsObjectValue, greeterIsSome, greeterPointer) return String.bridgeJSLiftReturn(ret) } func createOptionalGreeter() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_createOptionalGreeter(jsObjectValue) + let ret = bjs_DataProcessor_createOptionalGreeter(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } func handleAPIResult(_ result: Optional) -> Void { let (resultIsSome, resultCaseId) = result.bridgeJSLowerParameter() let jsObjectValue = jsObject.bridgeJSLowerParameter() - _extern_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId) + bjs_DataProcessor_handleAPIResult(jsObjectValue, resultIsSome, resultCaseId) } func getAPIResult() -> Optional { let jsObjectValue = jsObject.bridgeJSLowerParameter() - let ret = _extern_getAPIResult(jsObjectValue) + let ret = bjs_DataProcessor_getAPIResult(jsObjectValue) return Optional.bridgeJSLiftReturn(ret) } + func validate(_ value: Int) throws(JSException) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_DataProcessor_validate(jsObjectValue, valueValue) + if let error = _swift_js_take_exception() { throw error } + return Int.bridgeJSLiftReturn(ret) + } + + func loadLabel(_ key: String) async throws(JSException) -> String { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + key.bridgeJSWithLoweredParameter { (keyWord0, keyWord1, keyWord2) in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_loadLabel(resolveRef, rejectRef, jsObjectValue, keyWord0, keyWord1, keyWord2) + } + } + return resolved + } + + func reset() async throws(JSException) -> Void { + try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_reset(resolveRef, rejectRef, jsObjectValue) + } + } + + func fetchCount() async -> Int { + let resolved = try! await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<(sending Int) -> Void>.sending($0) }, makeRejectClosure: { JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_DataProcessor_fetchCount(resolveRef, rejectRef, jsObjectValue) + } + return resolved + } + var count: Int { get { let jsObjectValue = jsObject.bridgeJSLowerParameter() @@ -3817,9 +4460,9 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { return Optional.bridgeJSLiftReturnFromSideChannel() } set { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - bjs_DataProcessor_optionalTag_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength) + bjs_DataProcessor_optionalTag_set(jsObjectValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } } } @@ -3857,9 +4500,9 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { return Optional.bridgeJSLiftReturnFromSideChannel() } set { - newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueIsSome, newValueWord0, newValueWord1, newValueWord2) in let jsObjectValue = jsObject.bridgeJSLowerParameter() - bjs_DataProcessor_optionalTheme_set(jsObjectValue, newValueIsSome, newValueBytes, newValueLength) + bjs_DataProcessor_optionalTheme_set(jsObjectValue, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } } } @@ -3915,6 +4558,10 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { bjs_DataProcessor_optionalHelper_set(jsObjectValue, newValueIsSome, newValuePointer) } } +} + +struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject static func bridgeJSLiftParameter(_ value: Int32) -> Self { return AnyDataProcessor(jsObject: JSObject(id: UInt32(bitPattern: value))) @@ -3923,134 +4570,182 @@ struct AnyDataProcessor: DataProcessor, _BridgedSwiftProtocolWrapper { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_increment") -fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void +fileprivate func bjs_DataProcessor_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void #else -fileprivate func _extern_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void { +fileprivate func bjs_DataProcessor_increment_extern(_ jsObject: Int32, _ amount: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_increment(_ jsObject: Int32, _ amount: Int32) -> Void { - return _extern_increment_extern(jsObject, amount) +@inline(never) fileprivate func bjs_DataProcessor_increment(_ jsObject: Int32, _ amount: Int32) -> Void { + return bjs_DataProcessor_increment_extern(jsObject, amount) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getValue") -fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_getValue_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getValue_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_getValue_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_getValue(_ jsObject: Int32) -> Int32 { - return _extern_getValue_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_getValue(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_getValue_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_setLabelElements") -fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void +fileprivate func bjs_DataProcessor_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixWord0: Int32, _ labelPrefixWord1: Int32, _ labelPrefixWord2: Int32, _ labelSuffixWord0: Int32, _ labelSuffixWord1: Int32, _ labelSuffixWord2: Int32) -> Void #else -fileprivate func _extern_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void { +fileprivate func bjs_DataProcessor_setLabelElements_extern(_ jsObject: Int32, _ labelPrefixWord0: Int32, _ labelPrefixWord1: Int32, _ labelPrefixWord2: Int32, _ labelSuffixWord0: Int32, _ labelSuffixWord1: Int32, _ labelSuffixWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_setLabelElements(_ jsObject: Int32, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void { - return _extern_setLabelElements_extern(jsObject, labelPrefixBytes, labelPrefixLength, labelSuffixBytes, labelSuffixLength) +@inline(never) fileprivate func bjs_DataProcessor_setLabelElements(_ jsObject: Int32, _ labelPrefixWord0: Int32, _ labelPrefixWord1: Int32, _ labelPrefixWord2: Int32, _ labelSuffixWord0: Int32, _ labelSuffixWord1: Int32, _ labelSuffixWord2: Int32) -> Void { + return bjs_DataProcessor_setLabelElements_extern(jsObject, labelPrefixWord0, labelPrefixWord1, labelPrefixWord2, labelSuffixWord0, labelSuffixWord1, labelSuffixWord2) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getLabel") -fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_getLabel_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_getLabel_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_getLabel_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_getLabel(_ jsObject: Int32) -> Int32 { - return _extern_getLabel_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_getLabel(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_getLabel_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_isEven") -fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_isEven_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func _extern_isEven_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_isEven_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_isEven(_ jsObject: Int32) -> Int32 { - return _extern_isEven_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_isEven(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_isEven_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processGreeter") -fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 +fileprivate func bjs_DataProcessor_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _extern_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { +fileprivate func bjs_DataProcessor_processGreeter_extern(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { - return _extern_processGreeter_extern(jsObject, greeter) +@inline(never) fileprivate func bjs_DataProcessor_processGreeter(_ jsObject: Int32, _ greeter: UnsafeMutableRawPointer) -> Int32 { + return bjs_DataProcessor_processGreeter_extern(jsObject, greeter) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createGreeter") -fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_DataProcessor_createGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return _extern_createGreeter_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_createGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_createGreeter_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_processOptionalGreeter") -fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 +fileprivate func bjs_DataProcessor_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 #else -fileprivate func _extern_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { +fileprivate func bjs_DataProcessor_processOptionalGreeter_extern(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { - return _extern_processOptionalGreeter_extern(jsObject, greeterIsSome, greeterPointer) +@inline(never) fileprivate func bjs_DataProcessor_processOptionalGreeter(_ jsObject: Int32, _ greeterIsSome: Int32, _ greeterPointer: UnsafeMutableRawPointer) -> Int32 { + return bjs_DataProcessor_processOptionalGreeter_extern(jsObject, greeterIsSome, greeterPointer) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_createOptionalGreeter") -fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +fileprivate func bjs_DataProcessor_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer #else -fileprivate func _extern_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_DataProcessor_createOptionalGreeter_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return _extern_createOptionalGreeter_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_createOptionalGreeter(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_createOptionalGreeter_extern(jsObject) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_handleAPIResult") -fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void +fileprivate func bjs_DataProcessor_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void #else -fileprivate func _extern_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +fileprivate func bjs_DataProcessor_handleAPIResult_extern(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { - return _extern_handleAPIResult_extern(jsObject, resultIsSome, resultCaseId) +@inline(never) fileprivate func bjs_DataProcessor_handleAPIResult(_ jsObject: Int32, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + return bjs_DataProcessor_handleAPIResult_extern(jsObject, resultIsSome, resultCaseId) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_getAPIResult") -fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 +fileprivate func bjs_DataProcessor_getAPIResult_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_getAPIResult_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_getAPIResult(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_getAPIResult_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_validate") +fileprivate func bjs_DataProcessor_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_validate_extern(_ jsObject: Int32, _ value: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_validate(_ jsObject: Int32, _ value: Int32) -> Int32 { + return bjs_DataProcessor_validate_extern(jsObject, value) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_loadLabel") +fileprivate func bjs_DataProcessor_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_loadLabel_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_loadLabel(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32, _ keyWord0: Int32, _ keyWord1: Int32, _ keyWord2: Int32) -> Void { + return bjs_DataProcessor_loadLabel_extern(resolveRef, rejectRef, jsObject, keyWord0, keyWord1, keyWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_reset") +fileprivate func bjs_DataProcessor_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_reset_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_reset(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_DataProcessor_reset_extern(resolveRef, rejectRef, jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_fetchCount") +fileprivate func bjs_DataProcessor_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void #else -fileprivate func _extern_getAPIResult_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_DataProcessor_fetchCount_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _extern_getAPIResult(_ jsObject: Int32) -> Int32 { - return _extern_getAPIResult_extern(jsObject) +@inline(never) fileprivate func bjs_DataProcessor_fetchCount(_ resolveRef: Int32, _ rejectRef: Int32, _ jsObject: Int32) -> Void { + return bjs_DataProcessor_fetchCount_extern(resolveRef, rejectRef, jsObject) } #if arch(wasm32) @@ -4103,14 +4798,14 @@ fileprivate func bjs_DataProcessor_optionalTag_get_extern(_ jsObject: Int32) -> #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTag_set") -fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_DataProcessor_optionalTag_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_DataProcessor_optionalTag_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_DataProcessor_optionalTag_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_DataProcessor_optionalTag_set_extern(jsObject, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -4162,123 +4857,401 @@ fileprivate func bjs_DataProcessor_direction_set_extern(_ jsObject: Int32, _ new } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") -fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_get") +fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_optionalTheme_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") +fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_DataProcessor_optionalTheme_set_extern(jsObject, newValueIsSome, newValueWord0, newValueWord1, newValueWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") +fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void { + return bjs_DataProcessor_httpStatus_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") +fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { + return bjs_DataProcessor_httpStatus_set_extern(jsObject, newValueIsSome, newValueValue) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") +fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 { + return bjs_DataProcessor_apiResult_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") +fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +#else +fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { + return bjs_DataProcessor_apiResult_set_extern(jsObject, newValueIsSome, newValueCaseId) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") +fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_helper_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") +fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void +#else +fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { + return bjs_DataProcessor_helper_set_extern(jsObject, newValue) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") +fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +#else +fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { + return bjs_DataProcessor_optionalHelper_get_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") +fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void +#else +fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { + return bjs_DataProcessor_optionalHelper_set_extern(jsObject, newValueIsSome, newValuePointer) +} + +extension GenericRTPosition where Self: _BridgedSwiftProtocolWrapper { + func sum() -> Int { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_GenericRTPosition_sum(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } + + var x: Int { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_GenericRTPosition_x_get(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } + } +} + +struct AnyGenericRTPosition: GenericRTPosition, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyGenericRTPosition(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_GenericRTPosition_sum") +fileprivate func bjs_GenericRTPosition_sum_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_GenericRTPosition_sum_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericRTPosition_sum(_ jsObject: Int32) -> Int32 { + return bjs_GenericRTPosition_sum_extern(jsObject) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_GenericRTPosition_x_get") +fileprivate func bjs_GenericRTPosition_x_get_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_GenericRTPosition_x_get_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericRTPosition_x_get(_ jsObject: Int32) -> Int32 { + return bjs_GenericRTPosition_x_get_extern(jsObject) +} + +extension GenericRTNode where Self: _BridgedSwiftProtocolWrapper { + var y: Int { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_GenericRTNode_y_get(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } + } +} + +struct AnyGenericRTNode: GenericRTNode, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyGenericRTNode(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_GenericRTNode_y_get") +fileprivate func bjs_GenericRTNode_y_get_extern(_ jsObject: Int32) -> Int32 +#else +fileprivate func bjs_GenericRTNode_y_get_extern(_ jsObject: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_GenericRTNode_y_get(_ jsObject: Int32) -> Int32 { + return bjs_GenericRTNode_y_get_extern(jsObject) +} + +extension RefineIdentified where Self: _BridgedSwiftProtocolWrapper { + var id: String { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineIdentified_id_get(jsObjectValue) + return String.bridgeJSLiftReturn(ret) + } + } + + var score: Int { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineIdentified_score_get(jsObjectValue) + return Int.bridgeJSLiftReturn(ret) + } + set { + let newValueValue = newValue.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + bjs_RefineIdentified_score_set(jsObjectValue, newValueValue) + } + } +} + +struct AnyRefineIdentified: RefineIdentified, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyRefineIdentified(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineIdentified_id_get") +fileprivate func bjs_RefineIdentified_id_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_optionalTheme_get_extern(_ jsObject: Int32) -> Void { +fileprivate func bjs_RefineIdentified_id_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_get(_ jsObject: Int32) -> Void { - return bjs_DataProcessor_optionalTheme_get_extern(jsObject) +@inline(never) fileprivate func bjs_RefineIdentified_id_get(_ jsObject: Int32) -> Int32 { + return bjs_RefineIdentified_id_get_extern(jsObject) } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalTheme_set") -fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineIdentified_score_get") +fileprivate func bjs_RefineIdentified_score_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_optionalTheme_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_RefineIdentified_score_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_optionalTheme_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_DataProcessor_optionalTheme_set_extern(jsObject, newValueIsSome, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_RefineIdentified_score_get(_ jsObject: Int32) -> Int32 { + return bjs_RefineIdentified_score_get_extern(jsObject) } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_get") -fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineIdentified_score_set") +fileprivate func bjs_RefineIdentified_score_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void #else -fileprivate func bjs_DataProcessor_httpStatus_get_extern(_ jsObject: Int32) -> Void { +fileprivate func bjs_RefineIdentified_score_set_extern(_ jsObject: Int32, _ newValue: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_httpStatus_get(_ jsObject: Int32) -> Void { - return bjs_DataProcessor_httpStatus_get_extern(jsObject) +@inline(never) fileprivate func bjs_RefineIdentified_score_set(_ jsObject: Int32, _ newValue: Int32) -> Void { + return bjs_RefineIdentified_score_set_extern(jsObject, newValue) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_httpStatus_set") -fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void -#else -fileprivate func bjs_DataProcessor_httpStatus_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { - fatalError("Only available on WebAssembly") +extension RefineNamed where Self: _BridgedSwiftProtocolWrapper { + func label() -> String { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineNamed_label(jsObjectValue) + return String.bridgeJSLiftReturn(ret) + } + + var name: String { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineNamed_name_get(jsObjectValue) + return String.bridgeJSLiftReturn(ret) + } + } } -#endif -@inline(never) fileprivate func bjs_DataProcessor_httpStatus_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueValue: Int32) -> Void { - return bjs_DataProcessor_httpStatus_set_extern(jsObject, newValueIsSome, newValueValue) + +struct AnyRefineNamed: RefineNamed, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyRefineNamed(jsObject: JSObject(id: UInt32(bitPattern: value))) + } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_get") -fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineNamed_label") +fileprivate func bjs_RefineNamed_label_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_apiResult_get_extern(_ jsObject: Int32) -> Int32 { +fileprivate func bjs_RefineNamed_label_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_apiResult_get(_ jsObject: Int32) -> Int32 { - return bjs_DataProcessor_apiResult_get_extern(jsObject) +@inline(never) fileprivate func bjs_RefineNamed_label(_ jsObject: Int32) -> Int32 { + return bjs_RefineNamed_label_extern(jsObject) } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_apiResult_set") -fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineNamed_name_get") +fileprivate func bjs_RefineNamed_name_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_apiResult_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { +fileprivate func bjs_RefineNamed_name_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_apiResult_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValueCaseId: Int32) -> Void { - return bjs_DataProcessor_apiResult_set_extern(jsObject, newValueIsSome, newValueCaseId) +@inline(never) fileprivate func bjs_RefineNamed_name_get(_ jsObject: Int32) -> Int32 { + return bjs_RefineNamed_name_get_extern(jsObject) } -#if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_get") -fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer -#else -fileprivate func bjs_DataProcessor_helper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { - fatalError("Only available on WebAssembly") +extension RefineEntity where Self: _BridgedSwiftProtocolWrapper { + func label() -> String { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineEntity_label(jsObjectValue) + return String.bridgeJSLiftReturn(ret) + } + + var id: String { + get { + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_RefineEntity_id_get(jsObjectValue) + return String.bridgeJSLiftReturn(ret) + } + } } -#endif -@inline(never) fileprivate func bjs_DataProcessor_helper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return bjs_DataProcessor_helper_get_extern(jsObject) + +struct AnyRefineEntity: RefineEntity, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyRefineEntity(jsObject: JSObject(id: UInt32(bitPattern: value))) + } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_helper_set") -fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineEntity_label") +fileprivate func bjs_RefineEntity_label_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_helper_set_extern(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_RefineEntity_label_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_helper_set(_ jsObject: Int32, _ newValue: UnsafeMutableRawPointer) -> Void { - return bjs_DataProcessor_helper_set_extern(jsObject, newValue) +@inline(never) fileprivate func bjs_RefineEntity_label(_ jsObject: Int32) -> Int32 { + return bjs_RefineEntity_label_extern(jsObject) } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_get") -fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_RefineEntity_id_get") +fileprivate func bjs_RefineEntity_id_get_extern(_ jsObject: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_optionalHelper_get_extern(_ jsObject: Int32) -> UnsafeMutableRawPointer { +fileprivate func bjs_RefineEntity_id_get_extern(_ jsObject: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_get(_ jsObject: Int32) -> UnsafeMutableRawPointer { - return bjs_DataProcessor_optionalHelper_get_extern(jsObject) +@inline(never) fileprivate func bjs_RefineEntity_id_get(_ jsObject: Int32) -> Int32 { + return bjs_RefineEntity_id_get_extern(jsObject) +} + +struct AnyRefineTagged: RefineTagged, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyRefineTagged(jsObject: JSObject(id: UInt32(bitPattern: value))) + } +} + +extension JSNameTransformer where Self: _BridgedSwiftProtocolWrapper { + func apply(_ value: Int) -> Int { + let valueValue = value.bridgeJSLowerParameter() + let jsObjectValue = jsObject.bridgeJSLowerParameter() + let ret = bjs_JSNameTransformer_apply(jsObjectValue, valueValue) + return Int.bridgeJSLiftReturn(ret) + } +} + +struct AnyJSNameTransformer: JSNameTransformer, _BridgedSwiftProtocolWrapper { + let jsObject: JSObject + + static func bridgeJSLiftParameter(_ value: Int32) -> Self { + return AnyJSNameTransformer(jsObject: JSObject(id: UInt32(bitPattern: value))) + } } #if arch(wasm32) -@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_DataProcessor_optionalHelper_set") -fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JSNameTransformer_apply") +fileprivate func bjs_JSNameTransformer_apply_extern(_ jsObject: Int32, _ value: Int32) -> Int32 #else -fileprivate func bjs_DataProcessor_optionalHelper_set_extern(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { +fileprivate func bjs_JSNameTransformer_apply_extern(_ jsObject: Int32, _ value: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_DataProcessor_optionalHelper_set(_ jsObject: Int32, _ newValueIsSome: Int32, _ newValuePointer: UnsafeMutableRawPointer) -> Void { - return bjs_DataProcessor_optionalHelper_set_extern(jsObject, newValueIsSome, newValuePointer) +@inline(never) fileprivate func bjs_JSNameTransformer_apply(_ jsObject: Int32, _ value: Int32) -> Int32 { + return bjs_JSNameTransformer_apply_extern(jsObject, value) } extension Severity: _BridgedSwiftCaseEnum { @@ -4370,7 +5343,8 @@ extension InnerTag: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_ArraySupportExports_static_roundTripIntArray") public func _bjs_ArraySupportExports_static_roundTripIntArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripIntArray(_: [Int].bridgeJSStackPop()) + let v = [Int].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripIntArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4381,7 +5355,8 @@ public func _bjs_ArraySupportExports_static_roundTripIntArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripStringArray") public func _bjs_ArraySupportExports_static_roundTripStringArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripStringArray(_: [String].bridgeJSStackPop()) + let v = [String].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripStringArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4392,7 +5367,8 @@ public func _bjs_ArraySupportExports_static_roundTripStringArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripDoubleArray") public func _bjs_ArraySupportExports_static_roundTripDoubleArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripDoubleArray(_: [Double].bridgeJSStackPop()) + let v = [Double].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripDoubleArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4403,7 +5379,8 @@ public func _bjs_ArraySupportExports_static_roundTripDoubleArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripBoolArray") public func _bjs_ArraySupportExports_static_roundTripBoolArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripBoolArray(_: [Bool].bridgeJSStackPop()) + let v = [Bool].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripBoolArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4414,7 +5391,8 @@ public func _bjs_ArraySupportExports_static_roundTripBoolArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray") public func _bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripUnsafeRawPointerArray(_: [UnsafeRawPointer].bridgeJSStackPop()) + let v = [UnsafeRawPointer].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripUnsafeRawPointerArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4425,7 +5403,8 @@ public func _bjs_ArraySupportExports_static_roundTripUnsafeRawPointerArray() -> @_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray") public func _bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripUnsafeMutableRawPointerArray(_: [UnsafeMutableRawPointer].bridgeJSStackPop()) + let v = [UnsafeMutableRawPointer].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripUnsafeMutableRawPointerArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4436,7 +5415,8 @@ public func _bjs_ArraySupportExports_static_roundTripUnsafeMutableRawPointerArra @_cdecl("bjs_ArraySupportExports_static_roundTripOpaquePointerArray") public func _bjs_ArraySupportExports_static_roundTripOpaquePointerArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOpaquePointerArray(_: [OpaquePointer].bridgeJSStackPop()) + let v = [OpaquePointer].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOpaquePointerArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4447,7 +5427,8 @@ public func _bjs_ArraySupportExports_static_roundTripOpaquePointerArray() -> Voi @_cdecl("bjs_ArraySupportExports_static_roundTripUnsafePointerArray") public func _bjs_ArraySupportExports_static_roundTripUnsafePointerArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripUnsafePointerArray(_: [UnsafePointer].bridgeJSStackPop()) + let v = [UnsafePointer].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripUnsafePointerArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4458,7 +5439,8 @@ public func _bjs_ArraySupportExports_static_roundTripUnsafePointerArray() -> Voi @_cdecl("bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray") public func _bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer].bridgeJSStackPop()) + let v = [UnsafeMutablePointer].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripUnsafeMutablePointerArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4469,7 +5451,8 @@ public func _bjs_ArraySupportExports_static_roundTripUnsafeMutablePointerArray() @_cdecl("bjs_ArraySupportExports_static_roundTripJSValueArray") public func _bjs_ArraySupportExports_static_roundTripJSValueArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripJSValueArray(_: [JSValue].bridgeJSStackPop()) + let v = [JSValue].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripJSValueArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4480,7 +5463,8 @@ public func _bjs_ArraySupportExports_static_roundTripJSValueArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripJSObjectArray") public func _bjs_ArraySupportExports_static_roundTripJSObjectArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripJSObjectArray(_: [JSObject].bridgeJSStackPop()) + let v = [JSObject].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripJSObjectArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4491,7 +5475,8 @@ public func _bjs_ArraySupportExports_static_roundTripJSObjectArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripCaseEnumArray") public func _bjs_ArraySupportExports_static_roundTripCaseEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripCaseEnumArray(_: [Direction].bridgeJSStackPop()) + let v = [Direction].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripCaseEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4502,7 +5487,8 @@ public func _bjs_ArraySupportExports_static_roundTripCaseEnumArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripStringRawValueEnumArray(_: [Theme].bridgeJSStackPop()) + let v = [Theme].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripStringRawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4513,7 +5499,8 @@ public func _bjs_ArraySupportExports_static_roundTripStringRawValueEnumArray() - @_cdecl("bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripIntRawValueEnumArray(_: [HttpStatus].bridgeJSStackPop()) + let v = [HttpStatus].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripIntRawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4524,7 +5511,8 @@ public func _bjs_ArraySupportExports_static_roundTripIntRawValueEnumArray() -> V @_cdecl("bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripInt64RawValueEnumArray(_: [FileSize].bridgeJSStackPop()) + let v = [FileSize].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripInt64RawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4535,7 +5523,8 @@ public func _bjs_ArraySupportExports_static_roundTripInt64RawValueEnumArray() -> @_cdecl("bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripUInt64RawValueEnumArray(_: [SessionId].bridgeJSStackPop()) + let v = [SessionId].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripUInt64RawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4546,7 +5535,8 @@ public func _bjs_ArraySupportExports_static_roundTripUInt64RawValueEnumArray() - @_cdecl("bjs_ArraySupportExports_static_roundTripStructArray") public func _bjs_ArraySupportExports_static_roundTripStructArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripStructArray(_: [DataPoint].bridgeJSStackPop()) + let v = [DataPoint].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripStructArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4557,7 +5547,8 @@ public func _bjs_ArraySupportExports_static_roundTripStructArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripSwiftClassArray") public func _bjs_ArraySupportExports_static_roundTripSwiftClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripSwiftClassArray(_: [Greeter].bridgeJSStackPop()) + let v = [Greeter].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripSwiftClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4568,7 +5559,8 @@ public func _bjs_ArraySupportExports_static_roundTripSwiftClassArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray") public func _bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNamespacedSwiftClassArray(_: [Utils.Converter].bridgeJSStackPop()) + let v = [Utils.Converter].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNamespacedSwiftClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4579,9 +5571,10 @@ public func _bjs_ArraySupportExports_static_roundTripNamespacedSwiftClassArray() @_cdecl("bjs_ArraySupportExports_static_roundTripProtocolArray") public func _bjs_ArraySupportExports_static_roundTripProtocolArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripProtocolArray(_: [AnyArrayElementProtocol].bridgeJSStackPop()) + let v = [AnyArrayElementProtocol].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripProtocolArray(_: v) for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_elem_ret, "ArrayElementProtocol").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -4593,7 +5586,8 @@ public func _bjs_ArraySupportExports_static_roundTripProtocolArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripJSClassArray") public func _bjs_ArraySupportExports_static_roundTripJSClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripJSClassArray(_: [ArrayElementObject].bridgeJSStackPop()) + let v = [ArrayElementObject].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripJSClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4604,7 +5598,8 @@ public func _bjs_ArraySupportExports_static_roundTripJSClassArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntArray") public func _bjs_ArraySupportExports_static_roundTripOptionalIntArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalIntArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalIntArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4615,7 +5610,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalIntArray() -> Void @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringArray") public func _bjs_ArraySupportExports_static_roundTripOptionalStringArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalStringArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalStringArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4626,7 +5622,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalStringArray() -> Vo @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray") public func _bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalJSObjectArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalJSObjectArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4637,7 +5634,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalJSObjectArray() -> @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray") public func _bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalCaseEnumArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalCaseEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4648,7 +5646,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalCaseEnumArray() -> @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalStringRawValueEnumArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalStringRawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4659,7 +5658,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalStringRawValueEnumA @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalIntRawValueEnumArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalIntRawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4670,7 +5670,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalIntRawValueEnumArra @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalInt64RawValueEnumArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalInt64RawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4681,7 +5682,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalInt64RawValueEnumAr @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray") public func _bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalUInt64RawValueEnumArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalUInt64RawValueEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4692,7 +5694,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalUInt64RawValueEnumA @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalStructArray") public func _bjs_ArraySupportExports_static_roundTripOptionalStructArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalStructArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalStructArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4703,7 +5706,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalStructArray() -> Vo @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray") public func _bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalSwiftClassArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalSwiftClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4714,7 +5718,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalSwiftClassArray() - @_cdecl("bjs_ArraySupportExports_static_roundTripOptionalJSClassArray") public func _bjs_ArraySupportExports_static_roundTripOptionalJSClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripOptionalJSClassArray(_: [Optional].bridgeJSStackPop()) + let v = [Optional].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripOptionalJSClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4725,7 +5730,8 @@ public func _bjs_ArraySupportExports_static_roundTripOptionalJSClassArray() -> V @_cdecl("bjs_ArraySupportExports_static_roundTripNestedIntArray") public func _bjs_ArraySupportExports_static_roundTripNestedIntArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedIntArray(_: [[Int]].bridgeJSStackPop()) + let v = [[Int]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedIntArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4736,7 +5742,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedIntArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripNestedStringArray") public func _bjs_ArraySupportExports_static_roundTripNestedStringArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedStringArray(_: [[String]].bridgeJSStackPop()) + let v = [[String]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedStringArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4747,7 +5754,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedStringArray() -> Void @_cdecl("bjs_ArraySupportExports_static_roundTripNestedDoubleArray") public func _bjs_ArraySupportExports_static_roundTripNestedDoubleArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedDoubleArray(_: [[Double]].bridgeJSStackPop()) + let v = [[Double]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedDoubleArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4758,7 +5766,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedDoubleArray() -> Void @_cdecl("bjs_ArraySupportExports_static_roundTripNestedBoolArray") public func _bjs_ArraySupportExports_static_roundTripNestedBoolArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedBoolArray(_: [[Bool]].bridgeJSStackPop()) + let v = [[Bool]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedBoolArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4769,7 +5778,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedBoolArray() -> Void { @_cdecl("bjs_ArraySupportExports_static_roundTripNestedStructArray") public func _bjs_ArraySupportExports_static_roundTripNestedStructArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedStructArray(_: [[DataPoint]].bridgeJSStackPop()) + let v = [[DataPoint]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedStructArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4780,7 +5790,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedStructArray() -> Void @_cdecl("bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray") public func _bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedCaseEnumArray(_: [[Direction]].bridgeJSStackPop()) + let v = [[Direction]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedCaseEnumArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4791,7 +5802,8 @@ public func _bjs_ArraySupportExports_static_roundTripNestedCaseEnumArray() -> Vo @_cdecl("bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray") public func _bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray() -> Void { #if arch(wasm32) - let ret = ArraySupportExports.roundTripNestedSwiftClassArray(_: [[Greeter]].bridgeJSStackPop()) + let v = [[Greeter]].bridgeJSStackPop() + let ret = ArraySupportExports.roundTripNestedSwiftClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4802,9 +5814,9 @@ public func _bjs_ArraySupportExports_static_roundTripNestedSwiftClassArray() -> @_cdecl("bjs_ArraySupportExports_static_multiArrayFirst") public func _bjs_ArraySupportExports_static_multiArrayFirst() -> Void { #if arch(wasm32) - let _tmp_b = [String].bridgeJSStackPop() - let _tmp_a = [Int].bridgeJSStackPop() - let ret = ArraySupportExports.multiArrayFirst(_: _tmp_a, _: _tmp_b) + let b = [String].bridgeJSStackPop() + let a = [Int].bridgeJSStackPop() + let ret = ArraySupportExports.multiArrayFirst(_: a, _: b) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4815,9 +5827,9 @@ public func _bjs_ArraySupportExports_static_multiArrayFirst() -> Void { @_cdecl("bjs_ArraySupportExports_static_multiArraySecond") public func _bjs_ArraySupportExports_static_multiArraySecond() -> Void { #if arch(wasm32) - let _tmp_b = [String].bridgeJSStackPop() - let _tmp_a = [Int].bridgeJSStackPop() - let ret = ArraySupportExports.multiArraySecond(_: _tmp_a, _: _tmp_b) + let b = [String].bridgeJSStackPop() + let a = [Int].bridgeJSStackPop() + let ret = ArraySupportExports.multiArraySecond(_: a, _: b) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4828,9 +5840,9 @@ public func _bjs_ArraySupportExports_static_multiArraySecond() -> Void { @_cdecl("bjs_ArraySupportExports_static_multiOptionalArrayFirst") public func _bjs_ArraySupportExports_static_multiOptionalArrayFirst() -> Void { #if arch(wasm32) - let _tmp_b = Optional<[String]>.bridgeJSLiftParameter() - let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter() - let ret = ArraySupportExports.multiOptionalArrayFirst(_: _tmp_a, _: _tmp_b) + let b = Optional<[String]>.bridgeJSLiftParameter() + let a = Optional<[Int]>.bridgeJSLiftParameter() + let ret = ArraySupportExports.multiOptionalArrayFirst(_: a, _: b) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4841,9 +5853,9 @@ public func _bjs_ArraySupportExports_static_multiOptionalArrayFirst() -> Void { @_cdecl("bjs_ArraySupportExports_static_multiOptionalArraySecond") public func _bjs_ArraySupportExports_static_multiOptionalArraySecond() -> Void { #if arch(wasm32) - let _tmp_b = Optional<[String]>.bridgeJSLiftParameter() - let _tmp_a = Optional<[Int]>.bridgeJSLiftParameter() - let ret = ArraySupportExports.multiOptionalArraySecond(_: _tmp_a, _: _tmp_b) + let b = Optional<[String]>.bridgeJSLiftParameter() + let a = Optional<[Int]>.bridgeJSLiftParameter() + let ret = ArraySupportExports.multiOptionalArraySecond(_: a, _: b) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -4885,7 +5897,8 @@ extension Workspace.Kind: _BridgedSwiftEnumNoPayload, _BridgedSwiftRawValueEnum @_cdecl("bjs_DefaultArgumentExports_static_testStringDefault") public func _bjs_DefaultArgumentExports_static_testStringDefault(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.testStringDefault(message: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let ret = DefaultArgumentExports.testStringDefault(message: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4896,7 +5909,8 @@ public func _bjs_DefaultArgumentExports_static_testStringDefault(_ messageBytes: @_cdecl("bjs_DefaultArgumentExports_static_testIntDefault") public func _bjs_DefaultArgumentExports_static_testIntDefault(_ count: Int32) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.testIntDefault(count: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let ret = DefaultArgumentExports.testIntDefault(count: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4907,7 +5921,8 @@ public func _bjs_DefaultArgumentExports_static_testIntDefault(_ count: Int32) -> @_cdecl("bjs_DefaultArgumentExports_static_testBoolDefault") public func _bjs_DefaultArgumentExports_static_testBoolDefault(_ flag: Int32) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.testBoolDefault(flag: Bool.bridgeJSLiftParameter(flag)) + let flag = Bool.bridgeJSLiftParameter(flag) + let ret = DefaultArgumentExports.testBoolDefault(flag: flag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4918,7 +5933,8 @@ public func _bjs_DefaultArgumentExports_static_testBoolDefault(_ flag: Int32) -> @_cdecl("bjs_DefaultArgumentExports_static_testOptionalDefault") public func _bjs_DefaultArgumentExports_static_testOptionalDefault(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.testOptionalDefault(name: Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength)) + let name = Optional.bridgeJSLiftParameter(nameIsSome, nameBytes, nameLength) + let ret = DefaultArgumentExports.testOptionalDefault(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4929,7 +5945,10 @@ public func _bjs_DefaultArgumentExports_static_testOptionalDefault(_ nameIsSome: @_cdecl("bjs_DefaultArgumentExports_static_testMultipleDefaults") public func _bjs_DefaultArgumentExports_static_testMultipleDefaults(_ titleBytes: Int32, _ titleLength: Int32, _ count: Int32, _ enabled: Int32) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.testMultipleDefaults(title: String.bridgeJSLiftParameter(titleBytes, titleLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled)) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let count = Int.bridgeJSLiftParameter(count) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let ret = DefaultArgumentExports.testMultipleDefaults(title: title, count: count, enabled: enabled) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4940,7 +5959,8 @@ public func _bjs_DefaultArgumentExports_static_testMultipleDefaults(_ titleBytes @_cdecl("bjs_DefaultArgumentExports_static_testSimpleEnumDefault") public func _bjs_DefaultArgumentExports_static_testSimpleEnumDefault(_ status: Int32) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.testSimpleEnumDefault(status: Status.bridgeJSLiftParameter(status)) + let status = Status.bridgeJSLiftParameter(status) + let ret = DefaultArgumentExports.testSimpleEnumDefault(status: status) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4951,7 +5971,8 @@ public func _bjs_DefaultArgumentExports_static_testSimpleEnumDefault(_ status: I @_cdecl("bjs_DefaultArgumentExports_static_testDirectionDefault") public func _bjs_DefaultArgumentExports_static_testDirectionDefault(_ direction: Int32) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.testDirectionDefault(direction: Direction.bridgeJSLiftParameter(direction)) + let direction = Direction.bridgeJSLiftParameter(direction) + let ret = DefaultArgumentExports.testDirectionDefault(direction: direction) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4962,7 +5983,8 @@ public func _bjs_DefaultArgumentExports_static_testDirectionDefault(_ direction: @_cdecl("bjs_DefaultArgumentExports_static_testRawStringEnumDefault") public func _bjs_DefaultArgumentExports_static_testRawStringEnumDefault(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.testRawStringEnumDefault(theme: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = Theme.bridgeJSLiftParameter(themeBytes, themeLength) + let ret = DefaultArgumentExports.testRawStringEnumDefault(theme: theme) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4973,7 +5995,8 @@ public func _bjs_DefaultArgumentExports_static_testRawStringEnumDefault(_ themeB @_cdecl("bjs_DefaultArgumentExports_static_testComplexInit") public func _bjs_DefaultArgumentExports_static_testComplexInit(_ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.testComplexInit(greeter: Greeter.bridgeJSLiftParameter(greeter)) + let greeter = Greeter.bridgeJSLiftParameter(greeter) + let ret = DefaultArgumentExports.testComplexInit(greeter: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4984,7 +6007,8 @@ public func _bjs_DefaultArgumentExports_static_testComplexInit(_ greeter: Unsafe @_cdecl("bjs_DefaultArgumentExports_static_testEmptyInit") public func _bjs_DefaultArgumentExports_static_testEmptyInit(_ object: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DefaultArgumentExports.testEmptyInit(_: StaticPropertyHolder.bridgeJSLiftParameter(object)) + let object = StaticPropertyHolder.bridgeJSLiftParameter(object) + let ret = DefaultArgumentExports.testEmptyInit(_: object) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -4995,7 +6019,12 @@ public func _bjs_DefaultArgumentExports_static_testEmptyInit(_ object: UnsafeMut @_cdecl("bjs_DefaultArgumentExports_static_createConstructorDefaults") public func _bjs_DefaultArgumentExports_static_createConstructorDefaults(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DefaultArgumentExports.createConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) + let tag = Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength) + let status = Status.bridgeJSLiftParameter(status) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let count = Int.bridgeJSLiftParameter(count) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = DefaultArgumentExports.createConstructorDefaults(name: name, count: count, enabled: enabled, status: status, tag: tag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5006,7 +6035,8 @@ public func _bjs_DefaultArgumentExports_static_createConstructorDefaults(_ nameB @_cdecl("bjs_DefaultArgumentExports_static_describeConstructorDefaults") public func _bjs_DefaultArgumentExports_static_describeConstructorDefaults(_ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.describeConstructorDefaults(_: DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(value)) + let value = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(value) + let ret = DefaultArgumentExports.describeConstructorDefaults(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5017,7 +6047,8 @@ public func _bjs_DefaultArgumentExports_static_describeConstructorDefaults(_ val @_cdecl("bjs_DefaultArgumentExports_static_arrayWithDefault") public func _bjs_DefaultArgumentExports_static_arrayWithDefault() -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.arrayWithDefault(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let ret = DefaultArgumentExports.arrayWithDefault(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5028,7 +6059,8 @@ public func _bjs_DefaultArgumentExports_static_arrayWithDefault() -> Int32 { @_cdecl("bjs_DefaultArgumentExports_static_arrayWithOptionalDefault") public func _bjs_DefaultArgumentExports_static_arrayWithOptionalDefault() -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentExports.arrayWithOptionalDefault(_: Optional<[Int]>.bridgeJSLiftParameter()) + let values = Optional<[Int]>.bridgeJSLiftParameter() + let ret = DefaultArgumentExports.arrayWithOptionalDefault(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5039,7 +6071,10 @@ public func _bjs_DefaultArgumentExports_static_arrayWithOptionalDefault() -> Int @_cdecl("bjs_DefaultArgumentExports_static_arrayMixedDefaults") public func _bjs_DefaultArgumentExports_static_arrayMixedDefaults(_ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - let ret = DefaultArgumentExports.arrayMixedDefaults(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength), values: [Int].bridgeJSStackPop(), suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let suffix = String.bridgeJSLiftParameter(suffixBytes, suffixLength) + let values = [Int].bridgeJSStackPop() + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let ret = DefaultArgumentExports.arrayMixedDefaults(prefix: prefix, values: values, suffix: suffix) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5224,7 +6259,8 @@ extension AsyncPayloadResult: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_Utils_StringUtils_static_uppercase") public func _bjs_Utils_StringUtils_static_uppercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = Utils.StringUtils.uppercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let ret = Utils.StringUtils.uppercase(_: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5235,7 +6271,8 @@ public func _bjs_Utils_StringUtils_static_uppercase(_ textBytes: Int32, _ textLe @_cdecl("bjs_Utils_StringUtils_static_lowercase") public func _bjs_Utils_StringUtils_static_lowercase(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = Utils.StringUtils.lowercase(_: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let ret = Utils.StringUtils.lowercase(_: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5614,7 +6651,8 @@ extension StaticCalculator: _BridgedSwiftCaseEnum { @_cdecl("bjs_StaticCalculator_static_roundtrip") public func _bjs_StaticCalculator_static_roundtrip(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = StaticCalculator.roundtrip(_: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = StaticCalculator.roundtrip(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5625,7 +6663,8 @@ public func _bjs_StaticCalculator_static_roundtrip(_ value: Int32) -> Int32 { @_cdecl("bjs_StaticCalculator_static_doubleValue") public func _bjs_StaticCalculator_static_doubleValue(_ value: Int32) -> Int32 { #if arch(wasm32) - let ret = StaticCalculator.doubleValue(_: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = StaticCalculator.doubleValue(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5647,7 +6686,8 @@ public func _bjs_StaticCalculator_static_version_get() -> Void { @_cdecl("bjs_StaticUtils_Nested_static_roundtrip") public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = StaticUtils.Nested.roundtrip(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = StaticUtils.Nested.roundtrip(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5658,7 +6698,8 @@ public func _bjs_StaticUtils_Nested_static_roundtrip(_ valueBytes: Int32, _ valu @_cdecl("bjs_Services_Graph_GraphOperations_static_createGraph") public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.createGraph(rootId: Int.bridgeJSLiftParameter(rootId)) + let rootId = Int.bridgeJSLiftParameter(rootId) + let ret = GraphOperations.createGraph(rootId: rootId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5669,7 +6710,8 @@ public func _bjs_Services_Graph_GraphOperations_static_createGraph(_ rootId: Int @_cdecl("bjs_Services_Graph_GraphOperations_static_nodeCount") public func _bjs_Services_Graph_GraphOperations_static_nodeCount(_ graphId: Int32) -> Int32 { #if arch(wasm32) - let ret = GraphOperations.nodeCount(graphId: Int.bridgeJSLiftParameter(graphId)) + let graphId = Int.bridgeJSLiftParameter(graphId) + let ret = GraphOperations.nodeCount(graphId: graphId) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5726,7 +6768,8 @@ public func _bjs_StaticPropertyEnum_static_enumProperty_get() -> Void { @_cdecl("bjs_StaticPropertyEnum_static_enumProperty_set") public func _bjs_StaticPropertyEnum_static_enumProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyEnum.enumProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + StaticPropertyEnum.enumProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -5758,7 +6801,8 @@ public func _bjs_StaticPropertyEnum_static_enumBool_get() -> Int32 { @_cdecl("bjs_StaticPropertyEnum_static_enumBool_set") public func _bjs_StaticPropertyEnum_static_enumBool_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyEnum.enumBool = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + StaticPropertyEnum.enumBool = value #else fatalError("Only available on WebAssembly") #endif @@ -5779,7 +6823,8 @@ public func _bjs_StaticPropertyEnum_static_enumVariable_get() -> Int32 { @_cdecl("bjs_StaticPropertyEnum_static_enumVariable_set") public func _bjs_StaticPropertyEnum_static_enumVariable_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyEnum.enumVariable = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + StaticPropertyEnum.enumVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -5811,7 +6856,8 @@ public func _bjs_StaticPropertyEnum_static_computedReadWrite_get() -> Void { @_cdecl("bjs_StaticPropertyEnum_static_computedReadWrite_set") public func _bjs_StaticPropertyEnum_static_computedReadWrite_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyEnum.computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + StaticPropertyEnum.computedReadWrite = value #else fatalError("Only available on WebAssembly") #endif @@ -5832,7 +6878,8 @@ public func _bjs_StaticPropertyNamespace_static_namespaceProperty_get() -> Void @_cdecl("bjs_StaticPropertyNamespace_static_namespaceProperty_set") public func _bjs_StaticPropertyNamespace_static_namespaceProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyNamespace.namespaceProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + StaticPropertyNamespace.namespaceProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -5864,7 +6911,8 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_ @_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set") public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyNamespace.NestedProperties.nestedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + StaticPropertyNamespace.NestedProperties.nestedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -5896,7 +6944,8 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_ge @_cdecl("bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set") public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_set(_ value: Float64) -> Void { #if arch(wasm32) - StaticPropertyNamespace.NestedProperties.nestedDouble = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + StaticPropertyNamespace.NestedProperties.nestedDouble = value #else fatalError("Only available on WebAssembly") #endif @@ -5906,7 +6955,8 @@ public func _bjs_StaticPropertyNamespace_NestedProperties_static_nestedDouble_se @_cdecl("bjs_NestedStructGroupA_static_roundtripMetadata") public func _bjs_NestedStructGroupA_static_roundtripMetadata() -> Void { #if arch(wasm32) - let ret = NestedStructGroupA.roundtripMetadata(_: NestedStructGroupA.Metadata.bridgeJSLiftParameter()) + let m = NestedStructGroupA.Metadata.bridgeJSLiftParameter() + let ret = NestedStructGroupA.roundtripMetadata(_: m) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -5917,7 +6967,8 @@ public func _bjs_NestedStructGroupA_static_roundtripMetadata() -> Void { @_cdecl("bjs_NestedStructGroupB_static_roundtripMetadata") public func _bjs_NestedStructGroupB_static_roundtripMetadata() -> Void { #if arch(wasm32) - let ret = NestedStructGroupB.roundtripMetadata(_: NestedStructGroupB.Metadata.bridgeJSLiftParameter()) + let m = NestedStructGroupB.Metadata.bridgeJSLiftParameter() + let ret = NestedStructGroupB.roundtripMetadata(_: m) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6128,7 +7179,8 @@ extension GenericRTOutcome: _BridgedSwiftAssociatedValueEnum { @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt") public func _bjs_IntegerTypesSupportExports_static_roundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripInt(_: Int.bridgeJSLiftParameter(v)) + let v = Int.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripInt(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6139,7 +7191,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripInt(_ v: Int32) -> I @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt") public func _bjs_IntegerTypesSupportExports_static_roundTripUInt(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripUInt(_: UInt.bridgeJSLiftParameter(v)) + let v = UInt.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripUInt(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6150,7 +7203,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripUInt(_ v: Int32) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt8") public func _bjs_IntegerTypesSupportExports_static_roundTripInt8(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripInt8(_: Int8.bridgeJSLiftParameter(v)) + let v = Int8.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripInt8(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6161,7 +7215,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripInt8(_ v: Int32) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt8") public func _bjs_IntegerTypesSupportExports_static_roundTripUInt8(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripUInt8(_: UInt8.bridgeJSLiftParameter(v)) + let v = UInt8.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripUInt8(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6172,7 +7227,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripUInt8(_ v: Int32) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt16") public func _bjs_IntegerTypesSupportExports_static_roundTripInt16(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripInt16(_: Int16.bridgeJSLiftParameter(v)) + let v = Int16.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripInt16(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6183,7 +7239,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripInt16(_ v: Int32) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt16") public func _bjs_IntegerTypesSupportExports_static_roundTripUInt16(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripUInt16(_: UInt16.bridgeJSLiftParameter(v)) + let v = UInt16.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripUInt16(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6194,7 +7251,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripUInt16(_ v: Int32) - @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt32") public func _bjs_IntegerTypesSupportExports_static_roundTripInt32(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripInt32(_: Int32.bridgeJSLiftParameter(v)) + let v = Int32.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripInt32(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6205,7 +7263,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripInt32(_ v: Int32) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt32") public func _bjs_IntegerTypesSupportExports_static_roundTripUInt32(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripUInt32(_: UInt32.bridgeJSLiftParameter(v)) + let v = UInt32.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripUInt32(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6216,7 +7275,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripUInt32(_ v: Int32) - @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripInt64") public func _bjs_IntegerTypesSupportExports_static_roundTripInt64(_ v: Int64) -> Int64 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripInt64(_: Int64.bridgeJSLiftParameter(v)) + let v = Int64.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripInt64(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6227,7 +7287,21 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripInt64(_ v: Int64) -> @_cdecl("bjs_IntegerTypesSupportExports_static_roundTripUInt64") public func _bjs_IntegerTypesSupportExports_static_roundTripUInt64(_ v: Int64) -> Int64 { #if arch(wasm32) - let ret = IntegerTypesSupportExports.roundTripUInt64(_: UInt64.bridgeJSLiftParameter(v)) + let v = UInt64.bridgeJSLiftParameter(v) + let ret = IntegerTypesSupportExports.roundTripUInt64(_: v) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_Renaming_JSNameTools_static_apply") +@_cdecl("bjs_Renaming_JSNameTools_static_apply") +public func _bjs_Renaming_JSNameTools_static_apply(_ transformer: Int32, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let transformer = AnyJSNameTransformer.bridgeJSLiftParameter(transformer) + let ret = JSNameTools.apply(_: transformer, _: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6238,7 +7312,8 @@ public func _bjs_IntegerTypesSupportExports_static_roundTripUInt64(_ v: Int64) - @_cdecl("bjs_JSTypedArrayExports_static_roundTripUint8Array") public func _bjs_JSTypedArrayExports_static_roundTripUint8Array(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = JSTypedArrayExports.roundTripUint8Array(_: JSUint8Array.bridgeJSLiftParameter(v)) + let v = JSUint8Array.bridgeJSLiftParameter(v) + let ret = JSTypedArrayExports.roundTripUint8Array(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6249,7 +7324,8 @@ public func _bjs_JSTypedArrayExports_static_roundTripUint8Array(_ v: Int32) -> I @_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat32Array") public func _bjs_JSTypedArrayExports_static_roundTripFloat32Array(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = JSTypedArrayExports.roundTripFloat32Array(_: JSFloat32Array.bridgeJSLiftParameter(v)) + let v = JSFloat32Array.bridgeJSLiftParameter(v) + let ret = JSTypedArrayExports.roundTripFloat32Array(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6260,7 +7336,8 @@ public func _bjs_JSTypedArrayExports_static_roundTripFloat32Array(_ v: Int32) -> @_cdecl("bjs_JSTypedArrayExports_static_roundTripFloat64Array") public func _bjs_JSTypedArrayExports_static_roundTripFloat64Array(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = JSTypedArrayExports.roundTripFloat64Array(_: JSFloat64Array.bridgeJSLiftParameter(v)) + let v = JSFloat64Array.bridgeJSLiftParameter(v) + let ret = JSTypedArrayExports.roundTripFloat64Array(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6271,7 +7348,8 @@ public func _bjs_JSTypedArrayExports_static_roundTripFloat64Array(_ v: Int32) -> @_cdecl("bjs_JSTypedArrayExports_static_roundTripInt32Array") public func _bjs_JSTypedArrayExports_static_roundTripInt32Array(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = JSTypedArrayExports.roundTripInt32Array(_: JSInt32Array.bridgeJSLiftParameter(v)) + let v = JSInt32Array.bridgeJSLiftParameter(v) + let ret = JSTypedArrayExports.roundTripInt32Array(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6282,7 +7360,8 @@ public func _bjs_JSTypedArrayExports_static_roundTripInt32Array(_ v: Int32) -> I @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalString") public func _bjs_OptionalSupportExports_static_roundTripOptionalString(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalString(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) + let ret = OptionalSupportExports.roundTripOptionalString(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6293,7 +7372,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalString(_ vIsSome @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt") public func _bjs_OptionalSupportExports_static_roundTripOptionalInt(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalInt(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalInt(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6304,7 +7384,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalInt(_ vIsSome: I @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalBool") public func _bjs_OptionalSupportExports_static_roundTripOptionalBool(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalBool(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalBool(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6315,7 +7396,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalBool(_ vIsSome: @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalFloat") public func _bjs_OptionalSupportExports_static_roundTripOptionalFloat(_ vIsSome: Int32, _ vValue: Float32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalFloat(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalFloat(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6326,7 +7408,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalFloat(_ vIsSome: @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalDouble") public func _bjs_OptionalSupportExports_static_roundTripOptionalDouble(_ vIsSome: Int32, _ vValue: Float64) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalDouble(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalDouble(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6337,7 +7420,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalDouble(_ vIsSome @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSyntax") public func _bjs_OptionalSupportExports_static_roundTripOptionalSyntax(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalSyntax(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) + let ret = OptionalSupportExports.roundTripOptionalSyntax(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6348,7 +7432,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalSyntax(_ vIsSome @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalCaseEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalCaseEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6359,7 +7444,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalCaseEnum(_ vIsSo @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalStringRawValueEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) + let ret = OptionalSupportExports.roundTripOptionalStringRawValueEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6370,7 +7456,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalStringRawValueEn @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalIntRawValueEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalIntRawValueEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6381,7 +7468,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalIntRawValueEnum( @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalInt64RawValueEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalInt64RawValueEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6392,7 +7480,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalInt64RawValueEnu @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEnum(_ vIsSome: Int32, _ vValue: Int64) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalUInt64RawValueEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalUInt64RawValueEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6403,7 +7492,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalUInt64RawValueEn @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalTSEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalTSEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalTSEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6414,7 +7504,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalTSEnum(_ vIsSome @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalTSStringEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) + let ret = OptionalSupportExports.roundTripOptionalTSStringEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6425,7 +7516,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalTSStringEnum(_ v @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum") public func _bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalNamespacedEnum(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalNamespacedEnum(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6436,7 +7528,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalNamespacedEnum(_ @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass") public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass(_ vIsSome: Int32, _ vValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalSwiftClass(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = OptionalSupportExports.roundTripOptionalSwiftClass(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6447,7 +7540,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClass(_ vIs @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalIntArray") public func _bjs_OptionalSupportExports_static_roundTripOptionalIntArray() -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalIntArray(_: Optional<[Int]>.bridgeJSLiftParameter()) + let v = Optional<[Int]>.bridgeJSLiftParameter() + let ret = OptionalSupportExports.roundTripOptionalIntArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -6458,7 +7552,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalIntArray() -> Vo @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalStringArray") public func _bjs_OptionalSupportExports_static_roundTripOptionalStringArray() -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalStringArray(_: Optional<[String]>.bridgeJSLiftParameter()) + let v = Optional<[String]>.bridgeJSLiftParameter() + let ret = OptionalSupportExports.roundTripOptionalStringArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -6469,7 +7564,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalStringArray() -> @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray") public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray() -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalSwiftClassArray(_: Optional<[Greeter]>.bridgeJSLiftParameter()) + let v = Optional<[Greeter]>.bridgeJSLiftParameter() + let ret = OptionalSupportExports.roundTripOptionalSwiftClassArray(_: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -6480,7 +7576,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalSwiftClassArray( @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalAPIResult(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalAPIResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6491,7 +7588,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIResult(_ vIsS @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalTypedPayloadResult(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalTypedPayloadResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6502,7 +7600,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalTypedPayloadResu @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalComplexResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalComplexResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalComplexResult(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalComplexResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6513,7 +7612,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalComplexResult(_ @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalAllTypesResult(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalAllTypesResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6524,7 +7624,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalAllTypesResult(_ @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult(_ v: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalPayloadResult(_: OptionalAllTypesResult.bridgeJSLiftParameter(v)) + let v = OptionalAllTypesResult.bridgeJSLiftParameter(v) + let ret = OptionalSupportExports.roundTripOptionalPayloadResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6535,7 +7636,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResult(_ @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt") public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalPayloadResultOpt(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalPayloadResultOpt(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6546,7 +7648,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalPayloadResultOpt @_cdecl("bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult") public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResult(_ vIsSome: Int32, _ vCaseId: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.roundTripOptionalAPIOptionalResult(_: Optional.bridgeJSLiftParameter(vIsSome, vCaseId)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let ret = OptionalSupportExports.roundTripOptionalAPIOptionalResult(_: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6557,7 +7660,8 @@ public func _bjs_OptionalSupportExports_static_roundTripOptionalAPIOptionalResul @_cdecl("bjs_OptionalSupportExports_static_takeOptionalJSObject") public func _bjs_OptionalSupportExports_static_takeOptionalJSObject(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - OptionalSupportExports.takeOptionalJSObject(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue)) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + OptionalSupportExports.takeOptionalJSObject(_: value) #else fatalError("Only available on WebAssembly") #endif @@ -6567,7 +7671,9 @@ public func _bjs_OptionalSupportExports_static_takeOptionalJSObject(_ valueIsSom @_cdecl("bjs_OptionalSupportExports_static_applyOptionalGreeter") public func _bjs_OptionalSupportExports_static_applyOptionalGreeter(_ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer, _ transform: Int32) -> Void { #if arch(wasm32) - let ret = OptionalSupportExports.applyOptionalGreeter(_: Optional.bridgeJSLiftParameter(valueIsSome, valueValue), _: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform)) + let transform = _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_Sq7GreeterC.bridgeJSLift(transform) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let ret = OptionalSupportExports.applyOptionalGreeter(_: value, _: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6578,7 +7684,9 @@ public func _bjs_OptionalSupportExports_static_applyOptionalGreeter(_ valueIsSom @_cdecl("bjs_OptionalSupportExports_static_makeOptionalHolder") public func _bjs_OptionalSupportExports_static_makeOptionalHolder(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalSupportExports.makeOptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) + let undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue) + let nullableGreeter = Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue) + let ret = OptionalSupportExports.makeOptionalHolder(nullableGreeter: nullableGreeter, undefinedNumber: undefinedNumber) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6589,9 +7697,9 @@ public func _bjs_OptionalSupportExports_static_makeOptionalHolder(_ nullableGree @_cdecl("bjs_OptionalSupportExports_static_compareAPIResults") public func _bjs_OptionalSupportExports_static_compareAPIResults(_ r1IsSome: Int32, _ r1CaseId: Int32, _ r2IsSome: Int32, _ r2CaseId: Int32) -> Void { #if arch(wasm32) - let _tmp_r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) - let _tmp_r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) - let ret = OptionalSupportExports.compareAPIResults(_: _tmp_r1, _: _tmp_r2) + let r2 = Optional.bridgeJSLiftParameter(r2IsSome, r2CaseId) + let r1 = Optional.bridgeJSLiftParameter(r1IsSome, r1CaseId) + let ret = OptionalSupportExports.compareAPIResults(_: r1, _: r2) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6678,6 +7786,174 @@ extension APIOptionalResult: _BridgedSwiftAssociatedValueEnum { } } +@_expose(wasm, "bjs_StringABIExports_static_echo") +@_cdecl("bjs_StringABIExports_static_echo") +public func _bjs_StringABIExports_static_echo(_ valueBytes: Int32, _ valueLength: Int32) -> Void { + #if arch(wasm32) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = StringABIExports.echo(_: value) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_echoOptional") +@_cdecl("bjs_StringABIExports_static_echoOptional") +public func _bjs_StringABIExports_static_echoOptional(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { + #if arch(wasm32) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let ret = StringABIExports.echoOptional(_: value) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_echoArray") +@_cdecl("bjs_StringABIExports_static_echoArray") +public func _bjs_StringABIExports_static_echoArray() -> Void { + #if arch(wasm32) + let value = [String].bridgeJSStackPop() + let ret = StringABIExports.echoArray(_: value) + ret.bridgeJSStackPush() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallEmpty") +@_cdecl("bjs_StringABIExports_static_smallEmpty") +public func _bjs_StringABIExports_static_smallEmpty() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallEmpty() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallASCII") +@_cdecl("bjs_StringABIExports_static_smallASCII") +public func _bjs_StringABIExports_static_smallASCII() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallASCII() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallEight") +@_cdecl("bjs_StringABIExports_static_smallEight") +public func _bjs_StringABIExports_static_smallEight() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallEight() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallNine") +@_cdecl("bjs_StringABIExports_static_smallNine") +public func _bjs_StringABIExports_static_smallNine() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallNine() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallTen") +@_cdecl("bjs_StringABIExports_static_smallTen") +public func _bjs_StringABIExports_static_smallTen() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallTen() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_smallUTF8") +@_cdecl("bjs_StringABIExports_static_smallUTF8") +public func _bjs_StringABIExports_static_smallUTF8() -> Void { + #if arch(wasm32) + let ret = StringABIExports.smallUTF8() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_largeImmortal") +@_cdecl("bjs_StringABIExports_static_largeImmortal") +public func _bjs_StringABIExports_static_largeImmortal() -> Void { + #if arch(wasm32) + let ret = StringABIExports.largeImmortal() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_largeImmortalAgain") +@_cdecl("bjs_StringABIExports_static_largeImmortalAgain") +public func _bjs_StringABIExports_static_largeImmortalAgain() -> Void { + #if arch(wasm32) + let ret = StringABIExports.largeImmortalAgain() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_largeDynamic") +@_cdecl("bjs_StringABIExports_static_largeDynamic") +public func _bjs_StringABIExports_static_largeDynamic() -> Void { + #if arch(wasm32) + let ret = StringABIExports.largeDynamic() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_immortalSubstring") +@_cdecl("bjs_StringABIExports_static_immortalSubstring") +public func _bjs_StringABIExports_static_immortalSubstring() -> Void { + #if arch(wasm32) + let ret = StringABIExports.immortalSubstring() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_optionalNone") +@_cdecl("bjs_StringABIExports_static_optionalNone") +public func _bjs_StringABIExports_static_optionalNone() -> Void { + #if arch(wasm32) + let ret = StringABIExports.optionalNone() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_StringABIExports_static_optionalSome") +@_cdecl("bjs_StringABIExports_static_optionalSome") +public func _bjs_StringABIExports_static_optionalSome() -> Void { + #if arch(wasm32) + let ret = StringABIExports.optionalSome() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension JSCoordinate: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSCoordinate { let longitude = Double.bridgeJSStackPop() @@ -6730,7 +8006,9 @@ fileprivate func _bjs_struct_lift_JSCoordinate_extern() -> Int32 { @_cdecl("bjs_JSCoordinate_init") public func _bjs_JSCoordinate_init(_ latitude: Float64, _ longitude: Float64) -> Void { #if arch(wasm32) - let ret = JSCoordinate(latitude: Double.bridgeJSLiftParameter(latitude), longitude: Double.bridgeJSLiftParameter(longitude)) + let longitude = Double.bridgeJSLiftParameter(longitude) + let latitude = Double.bridgeJSLiftParameter(latitude) + let ret = JSCoordinate(latitude: latitude, longitude: longitude) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6883,7 +8161,8 @@ fileprivate func _bjs_struct_lift_NestedTypeHost_Label_extern() -> Int32 { @_cdecl("bjs_NestedTypeHost_Label_init") public func _bjs_NestedTypeHost_Label_init(_ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = NestedTypeHost.Label(text: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let ret = NestedTypeHost.Label(text: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6962,7 +8241,8 @@ fileprivate func _bjs_struct_lift_Library_Shelf_extern() -> Int32 { @_cdecl("bjs_Library_Shelf_init") public func _bjs_Library_Shelf_init(_ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.Shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = Library.Shelf(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -6984,7 +8264,8 @@ public func _bjs_Library_Shelf_static_capacity_get() -> Int32 { @_cdecl("bjs_Library_Shelf_describeShelf") public func _bjs_Library_Shelf_describeShelf() -> Void { #if arch(wasm32) - let ret = Library.Shelf.bridgeJSLiftParameter().describeShelf() + let _self = Library.Shelf.bridgeJSLiftParameter() + let ret = _self.describeShelf() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7041,7 +8322,8 @@ fileprivate func _bjs_struct_lift_Library_Shelf_Divider_extern() -> Int32 { @_cdecl("bjs_Library_Shelf_Divider_init") public func _bjs_Library_Shelf_Divider_init(_ slot: Int32) -> Void { #if arch(wasm32) - let ret = Library.Shelf.Divider(slot: Int.bridgeJSLiftParameter(slot)) + let slot = Int.bridgeJSLiftParameter(slot) + let ret = Library.Shelf.Divider(slot: slot) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7096,6 +8378,18 @@ fileprivate func _bjs_struct_lift_GenericRTPoint_extern() -> Int32 { return _bjs_struct_lift_GenericRTPoint_extern() } +@_expose(wasm, "bjs_GenericRTPoint_sum") +@_cdecl("bjs_GenericRTPoint_sum") +public func _bjs_GenericRTPoint_sum() -> Int32 { + #if arch(wasm32) + let _self = GenericRTPoint.bridgeJSLiftParameter() + let ret = _self.sum() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + extension GenericRTNamespace.Metadata: _BridgedSwiftStruct { @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> GenericRTNamespace.Metadata { let count = Int.bridgeJSStackPop() @@ -7184,12 +8478,70 @@ fileprivate func _bjs_struct_lower_Point_extern(_ objectId: Int32) -> Void { @_extern(wasm, module: "bjs", name: "swift_js_struct_lift_Point") fileprivate func _bjs_struct_lift_Point_extern() -> Int32 #else -fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { +fileprivate func _bjs_struct_lift_Point_extern() -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { + return _bjs_struct_lift_Point_extern() +} + +extension JSNameSnapshot: _BridgedSwiftStruct { + @_spi(BridgeJS) @_transparent public static func bridgeJSStackPop() -> JSNameSnapshot { + let value = Int.bridgeJSStackPop() + return JSNameSnapshot(value: value) + } + + @_spi(BridgeJS) @_transparent public consuming func bridgeJSStackPush() { + self.value.bridgeJSStackPush() + } + + init(unsafelyCopying jsObject: JSObject) { + _bjs_struct_lower_JSNameSnapshot(jsObject.bridgeJSLowerParameter()) + self = Self.bridgeJSStackPop() + } + + func toJSObject() -> JSObject { + let __bjs_self = self + __bjs_self.bridgeJSStackPush() + return JSObject(id: UInt32(bitPattern: _bjs_struct_lift_JSNameSnapshot())) + } +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lower_JSNameSnapshot") +fileprivate func _bjs_struct_lower_JSNameSnapshot_extern(_ objectId: Int32) -> Void +#else +fileprivate func _bjs_struct_lower_JSNameSnapshot_extern(_ objectId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func _bjs_struct_lower_JSNameSnapshot(_ objectId: Int32) -> Void { + return _bjs_struct_lower_JSNameSnapshot_extern(objectId) +} + +#if arch(wasm32) +@_extern(wasm, module: "bjs", name: "swift_js_struct_lift_JSNameSnapshot") +fileprivate func _bjs_struct_lift_JSNameSnapshot_extern() -> Int32 +#else +fileprivate func _bjs_struct_lift_JSNameSnapshot_extern() -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func _bjs_struct_lift_Point() -> Int32 { - return _bjs_struct_lift_Point_extern() +@inline(never) fileprivate func _bjs_struct_lift_JSNameSnapshot() -> Int32 { + return _bjs_struct_lift_JSNameSnapshot_extern() +} + +@_expose(wasm, "bjs_JSNameSnapshot_init") +@_cdecl("bjs_JSNameSnapshot_init") +public func _bjs_JSNameSnapshot_init(_ value: Int32) -> Void { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let ret = JSNameSnapshot(value: value) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif } extension PointerFields: _BridgedSwiftStruct { @@ -7250,7 +8602,12 @@ fileprivate func _bjs_struct_lift_PointerFields_extern() -> Int32 { @_cdecl("bjs_PointerFields_init") public func _bjs_PointerFields_init(_ raw: UnsafeMutableRawPointer, _ mutRaw: UnsafeMutableRawPointer, _ opaque: UnsafeMutableRawPointer, _ ptr: UnsafeMutableRawPointer, _ mutPtr: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PointerFields(raw: UnsafeRawPointer.bridgeJSLiftParameter(raw), mutRaw: UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw), opaque: OpaquePointer.bridgeJSLiftParameter(opaque), ptr: UnsafePointer.bridgeJSLiftParameter(ptr), mutPtr: UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr)) + let mutPtr = UnsafeMutablePointer.bridgeJSLiftParameter(mutPtr) + let ptr = UnsafePointer.bridgeJSLiftParameter(ptr) + let opaque = OpaquePointer.bridgeJSLiftParameter(opaque) + let mutRaw = UnsafeMutableRawPointer.bridgeJSLiftParameter(mutRaw) + let raw = UnsafeRawPointer.bridgeJSLiftParameter(raw) + let ret = PointerFields(raw: raw, mutRaw: mutRaw, opaque: opaque, ptr: ptr, mutPtr: mutPtr) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7315,7 +8672,12 @@ fileprivate func _bjs_struct_lift_DataPoint_extern() -> Int32 { @_cdecl("bjs_DataPoint_init") public func _bjs_DataPoint_init(_ x: Float64, _ y: Float64, _ labelBytes: Int32, _ labelLength: Int32, _ optCountIsSome: Int32, _ optCountValue: Int32, _ optFlagIsSome: Int32, _ optFlagValue: Int32) -> Void { #if arch(wasm32) - let ret = DataPoint(x: Double.bridgeJSLiftParameter(x), y: Double.bridgeJSLiftParameter(y), label: String.bridgeJSLiftParameter(labelBytes, labelLength), optCount: Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue), optFlag: Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue)) + let optFlag = Optional.bridgeJSLiftParameter(optFlagIsSome, optFlagValue) + let optCount = Optional.bridgeJSLiftParameter(optCountIsSome, optCountValue) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let y = Double.bridgeJSLiftParameter(y) + let x = Double.bridgeJSLiftParameter(x) + let ret = DataPoint(x: x, y: y, label: label, optCount: optCount, optFlag: optFlag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7396,7 +8758,9 @@ fileprivate func _bjs_struct_lift_PublicPoint_extern() -> Int32 { @_cdecl("bjs_PublicPoint_init") public func _bjs_PublicPoint_init(_ x: Int32, _ y: Int32) -> Void { #if arch(wasm32) - let ret = PublicPoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + let y = Int.bridgeJSLiftParameter(y) + let x = Int.bridgeJSLiftParameter(x) + let ret = PublicPoint(x: x, y: y) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7825,7 +9189,8 @@ fileprivate func _bjs_struct_lift_MathOperations_extern() -> Int32 { @_cdecl("bjs_MathOperations_init") public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { #if arch(wasm32) - let ret = MathOperations(baseValue: Double.bridgeJSLiftParameter(baseValue)) + let baseValue = Double.bridgeJSLiftParameter(baseValue) + let ret = MathOperations(baseValue: baseValue) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7836,7 +9201,10 @@ public func _bjs_MathOperations_init(_ baseValue: Float64) -> Void { @_cdecl("bjs_MathOperations_add") public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.bridgeJSLiftParameter().add(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let _self = MathOperations.bridgeJSLiftParameter() + let ret = _self.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7847,7 +9215,10 @@ public func _bjs_MathOperations_add(_ a: Float64, _ b: Float64) -> Float64 { @_cdecl("bjs_MathOperations_multiply") public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.bridgeJSLiftParameter().multiply(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let _self = MathOperations.bridgeJSLiftParameter() + let ret = _self.multiply(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7858,7 +9229,9 @@ public func _bjs_MathOperations_multiply(_ a: Float64, _ b: Float64) -> Float64 @_cdecl("bjs_MathOperations_static_subtract") public func _bjs_MathOperations_static_subtract(_ a: Float64, _ b: Float64) -> Float64 { #if arch(wasm32) - let ret = MathOperations.subtract(a: Double.bridgeJSLiftParameter(a), b: Double.bridgeJSLiftParameter(b)) + let b = Double.bridgeJSLiftParameter(b) + let a = Double.bridgeJSLiftParameter(a) + let ret = MathOperations.subtract(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -7917,7 +9290,8 @@ fileprivate func _bjs_struct_lift_CopyableCart_extern() -> Int32 { @_cdecl("bjs_CopyableCart_static_fromJSObject") public func _bjs_CopyableCart_static_fromJSObject(_ object: Int32) -> Void { #if arch(wasm32) - let ret = CopyableCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object)) + let object = JSObject.bridgeJSLiftParameter(object) + let ret = CopyableCart.fromJSObject(_: object) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8026,7 +9400,8 @@ fileprivate func _bjs_struct_lift_CopyableNestedCart_extern() -> Int32 { @_cdecl("bjs_CopyableNestedCart_static_fromJSObject") public func _bjs_CopyableNestedCart_static_fromJSObject(_ object: Int32) -> Void { #if arch(wasm32) - let ret = CopyableNestedCart.fromJSObject(_: JSObject.bridgeJSLiftParameter(object)) + let object = JSObject.bridgeJSLiftParameter(object) + let ret = CopyableNestedCart.fromJSObject(_: object) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8096,7 +9471,8 @@ public func _bjs_ConfigStruct_static_defaultConfig_get() -> Void { @_cdecl("bjs_ConfigStruct_static_defaultConfig_set") public func _bjs_ConfigStruct_static_defaultConfig_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - ConfigStruct.defaultConfig = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + ConfigStruct.defaultConfig = value #else fatalError("Only available on WebAssembly") #endif @@ -8128,7 +9504,8 @@ public func _bjs_ConfigStruct_static_timeout_get() -> Float64 { @_cdecl("bjs_ConfigStruct_static_timeout_set") public func _bjs_ConfigStruct_static_timeout_set(_ value: Float64) -> Void { #if arch(wasm32) - ConfigStruct.timeout = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + ConfigStruct.timeout = value #else fatalError("Only available on WebAssembly") #endif @@ -8197,7 +9574,9 @@ fileprivate func _bjs_struct_lift_Vector2D_extern() -> Int32 { @_cdecl("bjs_Vector2D_init") public func _bjs_Vector2D_init(_ dx: Float64, _ dy: Float64) -> Void { #if arch(wasm32) - let ret = Vector2D(dx: Double.bridgeJSLiftParameter(dx), dy: Double.bridgeJSLiftParameter(dy)) + let dy = Double.bridgeJSLiftParameter(dy) + let dx = Double.bridgeJSLiftParameter(dx) + let ret = Vector2D(dx: dx, dy: dy) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8208,7 +9587,8 @@ public func _bjs_Vector2D_init(_ dx: Float64, _ dy: Float64) -> Void { @_cdecl("bjs_Vector2D_magnitude") public func _bjs_Vector2D_magnitude() -> Float64 { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().magnitude() + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.magnitude() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8219,7 +9599,9 @@ public func _bjs_Vector2D_magnitude() -> Float64 { @_cdecl("bjs_Vector2D_scaled") public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().scaled(by: Double.bridgeJSLiftParameter(factor)) + let factor = Double.bridgeJSLiftParameter(factor) + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.scaled(by: factor) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8230,7 +9612,8 @@ public func _bjs_Vector2D_scaled(_ factor: Float64) -> Void { @_cdecl("bjs_Vector2D_describe") public func _bjs_Vector2D_describe() -> Void { #if arch(wasm32) - let ret = Vector2D.bridgeJSLiftParameter().describe() + let _self = Vector2D.bridgeJSLiftParameter() + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8385,7 +9768,9 @@ fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 { @_cdecl("bjs_ArrayMembers_sumValues") public func _bjs_ArrayMembers_sumValues() -> Int32 { #if arch(wasm32) - let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSStackPop()) + let values = [Int].bridgeJSStackPop() + let _self = ArrayMembers.bridgeJSLiftParameter() + let ret = _self.sumValues(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8396,18 +9781,75 @@ public func _bjs_ArrayMembers_sumValues() -> Int32 { @_cdecl("bjs_ArrayMembers_firstString") public func _bjs_ArrayMembers_firstString() -> Void { #if arch(wasm32) - let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSStackPop()) + let values = [String].bridgeJSStackPop() + let _self = ArrayMembers.bridgeJSLiftParameter() + let ret = _self.firstString(_: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } +@_expose(wasm, "bjs_ArrayMembers_ownSumAsync") +@_cdecl("bjs_ArrayMembers_ownSumAsync") +public func _bjs_ArrayMembers_ownSumAsync() -> Int32 { + #if arch(wasm32) + let _self = ArrayMembers.bridgeJSLiftParameter() + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.ownSumAsync() + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayMembers_sumAsync") +@_cdecl("bjs_ArrayMembers_sumAsync") +public func _bjs_ArrayMembers_sumAsync() -> Int32 { + #if arch(wasm32) + let values = [Int].bridgeJSStackPop() + let _self = ArrayMembers.bridgeJSLiftParameter() + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.sumAsync(_: values) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_ArrayMembers_requireValues") +@_cdecl("bjs_ArrayMembers_requireValues") +public func _bjs_ArrayMembers_requireValues() -> Void { + #if arch(wasm32) + let values = [Int].bridgeJSStackPop() + let _self = ArrayMembers.bridgeJSLiftParameter() + do { + let ret = try _self.requireValues(_: values) + ret.bridgeJSStackPush() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_makeTag") @_cdecl("bjs_makeTag") public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = makeTag(_: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = makeTag(_: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8418,7 +9860,8 @@ public func _bjs_makeTag(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutab @_cdecl("bjs_roundTripPolygon") public func _bjs_roundTripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripPolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = roundTripPolygon(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8429,7 +9872,9 @@ public func _bjs_roundTripPolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeM @_cdecl("bjs_appendVertex") public func _bjs_appendVertex(_ polygon: UnsafeMutableRawPointer, _ value: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = appendVertex(_: Polygon.bridgeJSLiftParameter(polygon), _: Double.bridgeJSLiftParameter(value)) + let value = Double.bridgeJSLiftParameter(value) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = appendVertex(_: polygon, _: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8440,7 +9885,8 @@ public func _bjs_appendVertex(_ polygon: UnsafeMutableRawPointer, _ value: Float @_cdecl("bjs_optionalRoundTripPolygon") public func _bjs_optionalRoundTripPolygon(_ polygonIsSome: Int32, _ polygonValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = optionalRoundTripPolygon(_: Optional.bridgeJSLiftParameter(polygonIsSome, polygonValue)) + let polygon = Optional.bridgeJSLiftParameter(polygonIsSome, polygonValue) + let ret = optionalRoundTripPolygon(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8451,7 +9897,8 @@ public func _bjs_optionalRoundTripPolygon(_ polygonIsSome: Int32, _ polygonValue @_cdecl("bjs_polygonVertexCount") public func _bjs_polygonVertexCount(_ polygon: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = polygonVertexCount(_: Polygon.bridgeJSLiftParameter(polygon)) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = polygonVertexCount(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8462,7 +9909,8 @@ public func _bjs_polygonVertexCount(_ polygon: UnsafeMutableRawPointer) -> Int32 @_cdecl("bjs_roundTripPolygonArray") public func _bjs_roundTripPolygonArray() -> Void { #if arch(wasm32) - let ret = roundTripPolygonArray(_: [Polygon].bridgeJSStackPop()) + let polygons = [Polygon].bridgeJSStackPop() + let ret = roundTripPolygonArray(_: polygons) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -8473,7 +9921,8 @@ public func _bjs_roundTripPolygonArray() -> Void { @_cdecl("bjs_concatPolygons") public func _bjs_concatPolygons() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = concatPolygons(_: [Polygon].bridgeJSStackPop()) + let polygons = [Polygon].bridgeJSStackPop() + let ret = concatPolygons(_: polygons) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8484,8 +9933,9 @@ public func _bjs_concatPolygons() -> UnsafeMutableRawPointer { @_cdecl("bjs_validatePolygon") public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) + let polygon = Polygon.bridgeJSLiftParameter(polygon) do { - let ret = try validatePolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let ret = try validatePolygon(_: polygon) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -8509,7 +9959,8 @@ public func _bjs_validatePolygon(_ polygon: UnsafeMutableRawPointer) -> UnsafeMu @_cdecl("bjs_splitPolygon") public func _bjs_splitPolygon(_ polygon: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = splitPolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = splitPolygon(_: polygon) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -8531,7 +9982,8 @@ public func _bjs_makePolygonInspector() -> Int32 { @_cdecl("bjs_roundTripOptionalPolygonArray") public func _bjs_roundTripOptionalPolygonArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalPolygonArray(_: [Optional].bridgeJSStackPop()) + let polygons = [Optional].bridgeJSStackPop() + let ret = roundTripOptionalPolygonArray(_: polygons) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -8542,7 +9994,9 @@ public func _bjs_roundTripOptionalPolygonArray() -> Void { @_cdecl("bjs_makeTagHolder") public func _bjs_makeTagHolder(_ nameBytes: Int32, _ nameLength: Int32, _ version: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = makeTagHolder(_: String.bridgeJSLiftParameter(nameBytes, nameLength), _: Int.bridgeJSLiftParameter(version)) + let version = Int.bridgeJSLiftParameter(version) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = makeTagHolder(_: name, _: version) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8553,7 +10007,8 @@ public func _bjs_makeTagHolder(_ nameBytes: Int32, _ nameLength: Int32, _ versio @_cdecl("bjs_roundTripCoordinate") public func _bjs_roundTripCoordinate() -> Void { #if arch(wasm32) - let ret = roundTripCoordinate(_: Coordinate.bridgeJSLiftParameter()) + let coordinate = Coordinate.bridgeJSLiftParameter() + let ret = roundTripCoordinate(_: coordinate) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8564,7 +10019,8 @@ public func _bjs_roundTripCoordinate() -> Void { @_cdecl("bjs_roundTripPriority") public func _bjs_roundTripPriority(_ priority: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripPriority(_: Priority.bridgeJSLiftParameter(priority)) + let priority = Priority.bridgeJSLiftParameter(priority) + let ret = roundTripPriority(_: priority) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8575,7 +10031,8 @@ public func _bjs_roundTripPriority(_ priority: UnsafeMutableRawPointer) -> Unsaf @_cdecl("bjs_roundTripAlert") public func _bjs_roundTripAlert(_ alert: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripAlert(_: Alert.bridgeJSLiftParameter(alert)) + let alert = Alert.bridgeJSLiftParameter(alert) + let ret = roundTripAlert(_: alert) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8586,7 +10043,8 @@ public func _bjs_roundTripAlert(_ alert: Int32) -> Int32 { @_cdecl("bjs_makeAlert") public func _bjs_makeAlert(_ level: Int32) -> Int32 { #if arch(wasm32) - let ret = makeAlert(_: Severity.bridgeJSLiftParameter(level)) + let level = Severity.bridgeJSLiftParameter(level) + let ret = makeAlert(_: level) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8597,7 +10055,8 @@ public func _bjs_makeAlert(_ level: Int32) -> Int32 { @_cdecl("bjs_roundTripShape") public func _bjs_roundTripShape(_ s: Int32) -> Void { #if arch(wasm32) - let ret = roundTripShape(_: Shape.bridgeJSLiftParameter(s)) + let s = Shape.bridgeJSLiftParameter(s) + let ret = roundTripShape(_: s) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8608,7 +10067,8 @@ public func _bjs_roundTripShape(_ s: Int32) -> Void { @_cdecl("bjs_makeShapePolygon") public func _bjs_makeShapePolygon(_ polygon: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = makeShapePolygon(_: Polygon.bridgeJSLiftParameter(polygon)) + let polygon = Polygon.bridgeJSLiftParameter(polygon) + let ret = makeShapePolygon(_: polygon) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8630,7 +10090,8 @@ public func _bjs_makeShapeEmpty() -> Void { @_cdecl("bjs_roundTripUserId") public func _bjs_roundTripUserId(_ id: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripUserId(_: UserId.bridgeJSLiftParameter(id)) + let id = UserId.bridgeJSLiftParameter(id) + let ret = roundTripUserId(_: id) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8641,7 +10102,8 @@ public func _bjs_roundTripUserId(_ id: Int32) -> Int32 { @_cdecl("bjs_roundTripOptionalUserId") public func _bjs_roundTripOptionalUserId(_ idIsSome: Int32, _ idValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalUserId(_: Optional.bridgeJSLiftParameter(idIsSome, idValue)) + let id = Optional.bridgeJSLiftParameter(idIsSome, idValue) + let ret = roundTripOptionalUserId(_: id) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8652,7 +10114,8 @@ public func _bjs_roundTripOptionalUserId(_ idIsSome: Int32, _ idValue: Int32) -> @_cdecl("bjs_roundTripUserIdArray") public func _bjs_roundTripUserIdArray() -> Void { #if arch(wasm32) - let ret = roundTripUserIdArray(_: [UserId].bridgeJSStackPop()) + let ids = [UserId].bridgeJSStackPop() + let ret = roundTripUserIdArray(_: ids) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -8663,7 +10126,8 @@ public func _bjs_roundTripUserIdArray() -> Void { @_cdecl("bjs_roundTripBoxed") public func _bjs_roundTripBoxed(_ boxedKind: Int32, _ boxedPayload1: Int32, _ boxedPayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripBoxed(_: Boxed.bridgeJSLiftParameter(boxedKind, boxedPayload1, boxedPayload2)) + let boxed = Boxed.bridgeJSLiftParameter(boxedKind, boxedPayload1, boxedPayload2) + let ret = roundTripBoxed(_: boxed) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8674,7 +10138,8 @@ public func _bjs_roundTripBoxed(_ boxedKind: Int32, _ boxedPayload1: Int32, _ bo @_cdecl("bjs_roundTripOptionalBoxed") public func _bjs_roundTripOptionalBoxed(_ boxedIsSome: Int32, _ boxedKind: Int32, _ boxedPayload1: Int32, _ boxedPayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalBoxed(_: Optional.bridgeJSLiftParameter(boxedIsSome, boxedKind, boxedPayload1, boxedPayload2)) + let boxed = Optional.bridgeJSLiftParameter(boxedIsSome, boxedKind, boxedPayload1, boxedPayload2) + let ret = roundTripOptionalBoxed(_: boxed) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8685,8 +10150,9 @@ public func _bjs_roundTripOptionalBoxed(_ boxedIsSome: Int32, _ boxedKind: Int32 @_cdecl("bjs_awaitAsyncCallback") public func _bjs_awaitAsyncCallback(_ fetch: Int32) -> Int32 { #if arch(wasm32) + let fetch = _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_SS.bridgeJSLift(fetch) return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in - return try await awaitAsyncCallback(_: _BJS_Closure_20BridgeJSRuntimeTestsYaKSS_SS.bridgeJSLift(fetch)) + return try await awaitAsyncCallback(_: fetch) } #else fatalError("Only available on WebAssembly") @@ -8752,8 +10218,9 @@ public func _bjs_makeAsyncPayloadLoader() -> Int32 { @_cdecl("bjs_awaitPayloadCallback") public func _bjs_awaitPayloadCallback(_ load: Int32) -> Int32 { #if arch(wasm32) + let load = _BJS_Closure_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO.bridgeJSLift(load) return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in - return try await awaitPayloadCallback(_: _BJS_Closure_20BridgeJSRuntimeTestsYaKSb_18AsyncPayloadResultO.bridgeJSLift(load)) + return try await awaitPayloadCallback(_: load) } #else fatalError("Only available on WebAssembly") @@ -8771,6 +10238,30 @@ public func _bjs_makeAsyncPointMaker() -> Int32 { #endif } +@_expose(wasm, "bjs_makeAsyncArraySum") +@_cdecl("bjs_makeAsyncArraySum") +public func _bjs_makeAsyncArraySum() -> Int32 { + #if arch(wasm32) + let ret = makeAsyncArraySum() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_awaitArraySum") +@_cdecl("bjs_awaitArraySum") +public func _bjs_awaitArraySum(_ sum: Int32) -> Int32 { + #if arch(wasm32) + let sum = _BJS_Closure_20BridgeJSRuntimeTestsYaSaSi_Si.bridgeJSLift(sum) + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await awaitArraySum(_: sum) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_makeThrowingParser") @_cdecl("bjs_makeThrowingParser") public func _bjs_makeThrowingParser() -> Int32 { @@ -8786,8 +10277,9 @@ public func _bjs_makeThrowingParser() -> Int32 { @_cdecl("bjs_runValidator") public func _bjs_runValidator(_ validate: Int32) -> Int32 { #if arch(wasm32) + let validate = _BJS_Closure_20BridgeJSRuntimeTestsKSS_Sb.bridgeJSLift(validate) do { - let ret = try runValidator(_: _BJS_Closure_20BridgeJSRuntimeTestsKSS_Sb.bridgeJSLift(validate)) + let ret = try runValidator(_: validate) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -8821,7 +10313,8 @@ public func _bjs_roundTripVoid() -> Void { @_cdecl("bjs_roundTripFloat") public func _bjs_roundTripFloat(_ v: Float32) -> Float32 { #if arch(wasm32) - let ret = roundTripFloat(v: Float.bridgeJSLiftParameter(v)) + let v = Float.bridgeJSLiftParameter(v) + let ret = roundTripFloat(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8832,7 +10325,8 @@ public func _bjs_roundTripFloat(_ v: Float32) -> Float32 { @_cdecl("bjs_roundTripDouble") public func _bjs_roundTripDouble(_ v: Float64) -> Float64 { #if arch(wasm32) - let ret = roundTripDouble(v: Double.bridgeJSLiftParameter(v)) + let v = Double.bridgeJSLiftParameter(v) + let ret = roundTripDouble(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8843,7 +10337,8 @@ public func _bjs_roundTripDouble(_ v: Float64) -> Float64 { @_cdecl("bjs_roundTripBool") public func _bjs_roundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripBool(v: Bool.bridgeJSLiftParameter(v)) + let v = Bool.bridgeJSLiftParameter(v) + let ret = roundTripBool(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8854,7 +10349,62 @@ public func _bjs_roundTripBool(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripString") public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void { #if arch(wasm32) - let ret = roundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)) + let v = String.bridgeJSLiftParameter(vBytes, vLength) + let ret = roundTripString(v: v) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeReservedWordParameters") +@_cdecl("bjs_describeReservedWordParameters") +public func _bjs_describeReservedWordParameters(_ `extension`: Int32, _ `break`: Float64, _ function: Int32, _ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let function = Bool.bridgeJSLiftParameter(function) + let `break` = Double.bridgeJSLiftParameter(`break`) + let `extension` = Int.bridgeJSLiftParameter(`extension`) + let ret = describeReservedWordParameters(extension: `extension`, break: `break`, function: function, in: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeBacktickedParameter") +@_cdecl("bjs_describeBacktickedParameter") +public func _bjs_describeBacktickedParameter(_ inBytes: Int32, _ inLength: Int32) -> Void { + #if arch(wasm32) + let `in` = String.bridgeJSLiftParameter(inBytes, inLength) + let ret = describeBacktickedParameter(_: `in`) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeCollidingParameters") +@_cdecl("bjs_describeCollidingParameters") +public func _bjs_describeCollidingParameters(_ `in`: Int32, _ _in: Int32, _ instance: Int32, _ swiftBytes: Int32, _ swiftLength: Int32) -> Void { + #if arch(wasm32) + let swift = String.bridgeJSLiftParameter(swiftBytes, swiftLength) + let instance = Int.bridgeJSLiftParameter(instance) + let _in = Int.bridgeJSLiftParameter(_in) + let `in` = Int.bridgeJSLiftParameter(`in`) + let ret = describeCollidingParameters(in: `in`, _in: _in, instance: instance, swift: swift) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeWithReservedWordDescriber") +@_cdecl("bjs_describeWithReservedWordDescriber") +public func _bjs_describeWithReservedWordDescriber(_ describer: Int32) -> Void { + #if arch(wasm32) + let describer = AnyReservedWordDescriber.bridgeJSLiftParameter(describer) + let ret = describeWithReservedWordDescriber(_: describer) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8865,7 +10415,8 @@ public func _bjs_roundTripString(_ vBytes: Int32, _ vLength: Int32) -> Void { @_cdecl("bjs_roundTripSwiftHeapObject") public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)) + let v = Greeter.bridgeJSLiftParameter(v) + let ret = roundTripSwiftHeapObject(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8876,7 +10427,8 @@ public func _bjs_roundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Unsaf @_cdecl("bjs_roundTripUnsafeRawPointer") public func _bjs_roundTripUnsafeRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripUnsafeRawPointer(v: UnsafeRawPointer.bridgeJSLiftParameter(v)) + let v = UnsafeRawPointer.bridgeJSLiftParameter(v) + let ret = roundTripUnsafeRawPointer(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8887,7 +10439,8 @@ public func _bjs_roundTripUnsafeRawPointer(_ v: UnsafeMutableRawPointer) -> Unsa @_cdecl("bjs_roundTripUnsafeMutableRawPointer") public func _bjs_roundTripUnsafeMutableRawPointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripUnsafeMutableRawPointer(v: UnsafeMutableRawPointer.bridgeJSLiftParameter(v)) + let v = UnsafeMutableRawPointer.bridgeJSLiftParameter(v) + let ret = roundTripUnsafeMutableRawPointer(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8898,7 +10451,8 @@ public func _bjs_roundTripUnsafeMutableRawPointer(_ v: UnsafeMutableRawPointer) @_cdecl("bjs_roundTripOpaquePointer") public func _bjs_roundTripOpaquePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripOpaquePointer(v: OpaquePointer.bridgeJSLiftParameter(v)) + let v = OpaquePointer.bridgeJSLiftParameter(v) + let ret = roundTripOpaquePointer(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8909,7 +10463,8 @@ public func _bjs_roundTripOpaquePointer(_ v: UnsafeMutableRawPointer) -> UnsafeM @_cdecl("bjs_roundTripUnsafePointer") public func _bjs_roundTripUnsafePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripUnsafePointer(v: UnsafePointer.bridgeJSLiftParameter(v)) + let v = UnsafePointer.bridgeJSLiftParameter(v) + let ret = roundTripUnsafePointer(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8920,7 +10475,8 @@ public func _bjs_roundTripUnsafePointer(_ v: UnsafeMutableRawPointer) -> UnsafeM @_cdecl("bjs_roundTripUnsafeMutablePointer") public func _bjs_roundTripUnsafeMutablePointer(_ v: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripUnsafeMutablePointer(v: UnsafeMutablePointer.bridgeJSLiftParameter(v)) + let v = UnsafeMutablePointer.bridgeJSLiftParameter(v) + let ret = roundTripUnsafeMutablePointer(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8931,7 +10487,8 @@ public func _bjs_roundTripUnsafeMutablePointer(_ v: UnsafeMutableRawPointer) -> @_cdecl("bjs_roundTripJSObject") public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) - let ret = roundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)) + let v = JSObject.bridgeJSLiftParameter(v) + let ret = roundTripJSObject(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8942,7 +10499,8 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 { @_cdecl("bjs_roundTripDictionaryExport") public func _bjs_roundTripDictionaryExport() -> Void { #if arch(wasm32) - let ret = roundTripDictionaryExport(v: [String: Int].bridgeJSLiftParameter()) + let v = [String: Int].bridgeJSLiftParameter() + let ret = roundTripDictionaryExport(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8953,7 +10511,8 @@ public func _bjs_roundTripDictionaryExport() -> Void { @_cdecl("bjs_roundTripOptionalDictionaryExport") public func _bjs_roundTripOptionalDictionaryExport() -> Void { #if arch(wasm32) - let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter()) + let v = Optional<[String: String]>.bridgeJSLiftParameter() + let ret = roundTripOptionalDictionaryExport(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8964,7 +10523,30 @@ public func _bjs_roundTripOptionalDictionaryExport() -> Void { @_cdecl("bjs_roundTripJSValue") public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripJSValue(v: JSValue.bridgeJSLiftParameter(vKind, vPayload1, vPayload2)) + let v = JSValue.bridgeJSLiftParameter(vKind, vPayload1, vPayload2) + let ret = roundTripJSValue(v: v) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeJSValueString") +@_cdecl("bjs_makeJSValueString") +public func _bjs_makeJSValueString() -> Void { + #if arch(wasm32) + let ret = makeJSValueString() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_makeJSValueObject") +@_cdecl("bjs_makeJSValueObject") +public func _bjs_makeJSValueObject() -> Void { + #if arch(wasm32) + let ret = makeJSValueObject() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8975,7 +10557,8 @@ public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload @_cdecl("bjs_roundTripOptionalJSValue") public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValue(v: Optional.bridgeJSLiftParameter(vIsSome, vKind, vPayload1, vPayload2)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vKind, vPayload1, vPayload2) + let ret = roundTripOptionalJSValue(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -8986,7 +10569,8 @@ public func _bjs_roundTripOptionalJSValue(_ vIsSome: Int32, _ vKind: Int32, _ vP @_cdecl("bjs_roundTripOptionalJSValueArray") public func _bjs_roundTripOptionalJSValueArray() -> Void { #if arch(wasm32) - let ret = roundTripOptionalJSValueArray(v: Optional<[JSValue]>.bridgeJSLiftParameter()) + let v = Optional<[JSValue]>.bridgeJSLiftParameter() + let ret = roundTripOptionalJSValueArray(v: v) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -8997,8 +10581,9 @@ public func _bjs_roundTripOptionalJSValueArray() -> Void { @_cdecl("bjs_makeImportedFoo") public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { #if arch(wasm32) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) do { - let ret = try makeImportedFoo(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let ret = try makeImportedFoo(value: value) return ret.bridgeJSLowerReturn() } catch let error { if let error = error.thrownValue.object { @@ -9022,7 +10607,8 @@ public func _bjs_makeImportedFoo(_ valueBytes: Int32, _ valueLength: Int32) -> I @_cdecl("bjs_roundTripOptionalImportedClass") public func _bjs_roundTripOptionalImportedClass(_ vIsSome: Int32, _ vValue: Int32) -> Void { #if arch(wasm32) - let ret = roundTripOptionalImportedClass(v: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) + let ret = roundTripOptionalImportedClass(v: v) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9033,8 +10619,9 @@ public func _bjs_roundTripOptionalImportedClass(_ vIsSome: Int32, _ vValue: Int3 @_cdecl("bjs_throwsSwiftError") public func _bjs_throwsSwiftError(_ shouldThrow: Int32) -> Void { #if arch(wasm32) + let shouldThrow = Bool.bridgeJSLiftParameter(shouldThrow) do { - try throwsSwiftError(shouldThrow: Bool.bridgeJSLiftParameter(shouldThrow)) + try throwsSwiftError(shouldThrow: shouldThrow) } catch let error { if let error = error.thrownValue.object { withExtendedLifetime(error) { @@ -9228,6 +10815,56 @@ public func _bjs_throwsWithJSObjectResult() -> Int32 { #endif } +@_expose(wasm, "bjs_throwsBeforeJSObjectResult") +@_cdecl("bjs_throwsBeforeJSObjectResult") +public func _bjs_throwsBeforeJSObjectResult() -> Int32 { + #if arch(wasm32) + do { + let ret = try throwsBeforeJSObjectResult() + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_throwsBeforeProtocolResult") +@_cdecl("bjs_throwsBeforeProtocolResult") +public func _bjs_throwsBeforeProtocolResult() -> Int32 { + #if arch(wasm32) + do { + let ret = _bridgeJSUnwrapProtocolExportable(try throwsBeforeProtocolResult(), "DataProcessor") + return ret.bridgeJSLowerAsProtocolReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_zeroArgAsyncThrows") @_cdecl("bjs_zeroArgAsyncThrows") public func _bjs_zeroArgAsyncThrows() -> Int32 { @@ -9258,8 +10895,9 @@ public func _bjs_asyncRoundTripVoid() -> Int32 { @_cdecl("bjs_asyncRoundTripInt") public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = Int.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { - return await asyncRoundTripInt(v: Int.bridgeJSLiftParameter(v)) + return await asyncRoundTripInt(v: v) } #else fatalError("Only available on WebAssembly") @@ -9270,8 +10908,9 @@ public func _bjs_asyncRoundTripInt(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripFloat") public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { #if arch(wasm32) + let v = Float.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sf, reject: Promise_reject) { - return await asyncRoundTripFloat(v: Float.bridgeJSLiftParameter(v)) + return await asyncRoundTripFloat(v: v) } #else fatalError("Only available on WebAssembly") @@ -9282,8 +10921,9 @@ public func _bjs_asyncRoundTripFloat(_ v: Float32) -> Int32 { @_cdecl("bjs_asyncRoundTripDouble") public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { #if arch(wasm32) + let v = Double.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sd, reject: Promise_reject) { - return await asyncRoundTripDouble(v: Double.bridgeJSLiftParameter(v)) + return await asyncRoundTripDouble(v: v) } #else fatalError("Only available on WebAssembly") @@ -9294,8 +10934,9 @@ public func _bjs_asyncRoundTripDouble(_ v: Float64) -> Int32 { @_cdecl("bjs_asyncRoundTripBool") public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = Bool.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_Sb, reject: Promise_reject) { - return await asyncRoundTripBool(v: Bool.bridgeJSLiftParameter(v)) + return await asyncRoundTripBool(v: v) } #else fatalError("Only available on WebAssembly") @@ -9306,8 +10947,9 @@ public func _bjs_asyncRoundTripBool(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripString") public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = String.bridgeJSLiftParameter(vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { - return await asyncRoundTripString(v: String.bridgeJSLiftParameter(vBytes, vLength)) + return await asyncRoundTripString(v: v) } #else fatalError("Only available on WebAssembly") @@ -9318,8 +10960,9 @@ public func _bjs_asyncRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int3 @_cdecl("bjs_asyncRoundTripSwiftHeapObject") public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) + let v = Greeter.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_7GreeterC, reject: Promise_reject) { - return await asyncRoundTripSwiftHeapObject(v: Greeter.bridgeJSLiftParameter(v)) + return await asyncRoundTripSwiftHeapObject(v: v) } #else fatalError("Only available on WebAssembly") @@ -9330,8 +10973,9 @@ public func _bjs_asyncRoundTripSwiftHeapObject(_ v: UnsafeMutableRawPointer) -> @_cdecl("bjs_asyncRoundTripJSObject") public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = JSObject.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_8JSObjectC, reject: Promise_reject) { - return await asyncRoundTripJSObject(v: JSObject.bridgeJSLiftParameter(v)) + return await asyncRoundTripJSObject(v: v) } #else fatalError("Only available on WebAssembly") @@ -9342,7 +10986,9 @@ public func _bjs_asyncRoundTripJSObject(_ v: Int32) -> Int32 { @_cdecl("bjs_takeGreeter") public func _bjs_takeGreeter(_ g: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - takeGreeter(g: Greeter.bridgeJSLiftParameter(g), name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let g = Greeter.bridgeJSLiftParameter(g) + takeGreeter(g: g, name: name) #else fatalError("Only available on WebAssembly") #endif @@ -9363,7 +11009,10 @@ public func _bjs_createCalculator() -> UnsafeMutableRawPointer { @_cdecl("bjs_useCalculator") public func _bjs_useCalculator(_ calc: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) - let ret = useCalculator(calc: Calculator.bridgeJSLiftParameter(calc), x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + let y = Int.bridgeJSLiftParameter(y) + let x = Int.bridgeJSLiftParameter(x) + let calc = Calculator.bridgeJSLiftParameter(calc) + let ret = useCalculator(calc: calc, x: x, y: y) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9396,7 +11045,8 @@ public func _bjs_testCalculatorToJSValue() -> Int32 { @_cdecl("bjs_testSwiftClassAsJSValue") public func _bjs_testSwiftClassAsJSValue(_ greeter: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = testSwiftClassAsJSValue(greeter: Greeter.bridgeJSLiftParameter(greeter)) + let greeter = Greeter.bridgeJSLiftParameter(greeter) + let ret = testSwiftClassAsJSValue(greeter: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9407,7 +11057,8 @@ public func _bjs_testSwiftClassAsJSValue(_ greeter: UnsafeMutableRawPointer) -> @_cdecl("bjs_setDirection") public func _bjs_setDirection(_ direction: Int32) -> Int32 { #if arch(wasm32) - let ret = setDirection(_: Direction.bridgeJSLiftParameter(direction)) + let direction = Direction.bridgeJSLiftParameter(direction) + let ret = setDirection(_: direction) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9429,7 +11080,8 @@ public func _bjs_getDirection() -> Int32 { @_cdecl("bjs_processDirection") public func _bjs_processDirection(_ input: Int32) -> Int32 { #if arch(wasm32) - let ret = processDirection(_: Direction.bridgeJSLiftParameter(input)) + let input = Direction.bridgeJSLiftParameter(input) + let ret = processDirection(_: input) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9440,7 +11092,8 @@ public func _bjs_processDirection(_ input: Int32) -> Int32 { @_cdecl("bjs_setTheme") public func _bjs_setTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - let ret = setTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = Theme.bridgeJSLiftParameter(themeBytes, themeLength) + let ret = setTheme(_: theme) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9462,8 +11115,9 @@ public func _bjs_getTheme() -> Void { @_cdecl("bjs_asyncRoundTripTheme") public func _bjs_asyncRoundTripTheme(_ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = Theme.bridgeJSLiftParameter(vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_5ThemeO, reject: Promise_reject) { - return await asyncRoundTripTheme(_: Theme.bridgeJSLiftParameter(vBytes, vLength)) + return await asyncRoundTripTheme(_: v) } #else fatalError("Only available on WebAssembly") @@ -9474,8 +11128,9 @@ public func _bjs_asyncRoundTripTheme(_ vBytes: Int32, _ vLength: Int32) -> Int32 @_cdecl("bjs_asyncRoundTripDirection") public func _bjs_asyncRoundTripDirection(_ v: Int32) -> Int32 { #if arch(wasm32) + let v = Direction.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_9DirectionO, reject: Promise_reject) { - return await asyncRoundTripDirection(_: Direction.bridgeJSLiftParameter(v)) + return await asyncRoundTripDirection(_: v) } #else fatalError("Only available on WebAssembly") @@ -9486,8 +11141,9 @@ public func _bjs_asyncRoundTripDirection(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripOptionalTheme") public func _bjs_asyncRoundTripOptionalTheme(_ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Int32 { #if arch(wasm32) + let v = Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength) return _bjs_makePromise(resolve: Promise_resolve_Sq5ThemeO, reject: Promise_reject) { - return await asyncRoundTripOptionalTheme(_: Optional.bridgeJSLiftParameter(vIsSome, vBytes, vLength)) + return await asyncRoundTripOptionalTheme(_: v) } #else fatalError("Only available on WebAssembly") @@ -9498,8 +11154,9 @@ public func _bjs_asyncRoundTripOptionalTheme(_ vIsSome: Int32, _ vBytes: Int32, @_cdecl("bjs_asyncRoundTripOptionalDirection") public func _bjs_asyncRoundTripOptionalDirection(_ vIsSome: Int32, _ vValue: Int32) -> Int32 { #if arch(wasm32) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) return _bjs_makePromise(resolve: Promise_resolve_Sq9DirectionO, reject: Promise_reject) { - return await asyncRoundTripOptionalDirection(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + return await asyncRoundTripOptionalDirection(_: v) } #else fatalError("Only available on WebAssembly") @@ -9510,9 +11167,9 @@ public func _bjs_asyncRoundTripOptionalDirection(_ vIsSome: Int32, _ vValue: Int @_cdecl("bjs_asyncRoundTripDirectionArray") public func _bjs_asyncRoundTripDirectionArray() -> Int32 { #if arch(wasm32) - let _tmp_v = [Direction].bridgeJSStackPop() + let v = [Direction].bridgeJSStackPop() return _bjs_makePromise(resolve: Promise_resolve_Sa9DirectionO, reject: Promise_reject) { - return await asyncRoundTripDirectionArray(_: _tmp_v) + return await asyncRoundTripDirectionArray(_: v) } #else fatalError("Only available on WebAssembly") @@ -9523,9 +11180,9 @@ public func _bjs_asyncRoundTripDirectionArray() -> Int32 { @_cdecl("bjs_asyncRoundTripDirectionDict") public func _bjs_asyncRoundTripDirectionDict() -> Int32 { #if arch(wasm32) - let _tmp_v = [String: Direction].bridgeJSLiftParameter() + let v = [String: Direction].bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_SD9DirectionO, reject: Promise_reject) { - return await asyncRoundTripDirectionDict(_: _tmp_v) + return await asyncRoundTripDirectionDict(_: v) } #else fatalError("Only available on WebAssembly") @@ -9536,9 +11193,9 @@ public func _bjs_asyncRoundTripDirectionDict() -> Int32 { @_cdecl("bjs_asyncRoundTripThemeArray") public func _bjs_asyncRoundTripThemeArray() -> Int32 { #if arch(wasm32) - let _tmp_v = [Theme].bridgeJSStackPop() + let v = [Theme].bridgeJSStackPop() return _bjs_makePromise(resolve: Promise_resolve_Sa5ThemeO, reject: Promise_reject) { - return await asyncRoundTripThemeArray(_: _tmp_v) + return await asyncRoundTripThemeArray(_: v) } #else fatalError("Only available on WebAssembly") @@ -9549,9 +11206,9 @@ public func _bjs_asyncRoundTripThemeArray() -> Int32 { @_cdecl("bjs_asyncRoundTripThemeDict") public func _bjs_asyncRoundTripThemeDict() -> Int32 { #if arch(wasm32) - let _tmp_v = [String: Theme].bridgeJSLiftParameter() + let v = [String: Theme].bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_SD5ThemeO, reject: Promise_reject) { - return await asyncRoundTripThemeDict(_: _tmp_v) + return await asyncRoundTripThemeDict(_: v) } #else fatalError("Only available on WebAssembly") @@ -9562,8 +11219,9 @@ public func _bjs_asyncRoundTripThemeDict() -> Int32 { @_cdecl("bjs_asyncRoundTripFileSize") public func _bjs_asyncRoundTripFileSize(_ v: Int64) -> Int32 { #if arch(wasm32) + let v = FileSize.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_8FileSizeO, reject: Promise_reject) { - return await asyncRoundTripFileSize(_: FileSize.bridgeJSLiftParameter(v)) + return await asyncRoundTripFileSize(_: v) } #else fatalError("Only available on WebAssembly") @@ -9574,8 +11232,9 @@ public func _bjs_asyncRoundTripFileSize(_ v: Int64) -> Int32 { @_cdecl("bjs_asyncRoundTripOptionalFileSize") public func _bjs_asyncRoundTripOptionalFileSize(_ vIsSome: Int32, _ vValue: Int64) -> Int32 { #if arch(wasm32) + let v = Optional.bridgeJSLiftParameter(vIsSome, vValue) return _bjs_makePromise(resolve: Promise_resolve_Sq8FileSizeO, reject: Promise_reject) { - return await asyncRoundTripOptionalFileSize(_: Optional.bridgeJSLiftParameter(vIsSome, vValue)) + return await asyncRoundTripOptionalFileSize(_: v) } #else fatalError("Only available on WebAssembly") @@ -9586,9 +11245,9 @@ public func _bjs_asyncRoundTripOptionalFileSize(_ vIsSome: Int32, _ vValue: Int6 @_cdecl("bjs_asyncRoundTripAssociatedValueEnum") public func _bjs_asyncRoundTripAssociatedValueEnum(_ v: Int32) -> Int32 { #if arch(wasm32) - let _tmp_v = AsyncPayloadResult.bridgeJSLiftParameter(v) + let v = AsyncPayloadResult.bridgeJSLiftParameter(v) return _bjs_makePromise(resolve: Promise_resolve_18AsyncPayloadResultO, reject: Promise_reject) { - return await asyncRoundTripAssociatedValueEnum(_: _tmp_v) + return await asyncRoundTripAssociatedValueEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -9599,9 +11258,9 @@ public func _bjs_asyncRoundTripAssociatedValueEnum(_ v: Int32) -> Int32 { @_cdecl("bjs_asyncRoundTripOptionalAssociatedValueEnum") public func _bjs_asyncRoundTripOptionalAssociatedValueEnum(_ vIsSome: Int32, _ vCaseId: Int32) -> Int32 { #if arch(wasm32) - let _tmp_v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) + let v = Optional.bridgeJSLiftParameter(vIsSome, vCaseId) return _bjs_makePromise(resolve: Promise_resolve_Sq18AsyncPayloadResultO, reject: Promise_reject) { - return await asyncRoundTripOptionalAssociatedValueEnum(_: _tmp_v) + return await asyncRoundTripOptionalAssociatedValueEnum(_: v) } #else fatalError("Only available on WebAssembly") @@ -9612,7 +11271,8 @@ public func _bjs_asyncRoundTripOptionalAssociatedValueEnum(_ vIsSome: Int32, _ v @_cdecl("bjs_setHttpStatus") public func _bjs_setHttpStatus(_ status: Int32) -> Int32 { #if arch(wasm32) - let ret = setHttpStatus(_: HttpStatus.bridgeJSLiftParameter(status)) + let status = HttpStatus.bridgeJSLiftParameter(status) + let ret = setHttpStatus(_: status) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9634,7 +11294,8 @@ public func _bjs_getHttpStatus() -> Int32 { @_cdecl("bjs_setFileSize") public func _bjs_setFileSize(_ size: Int64) -> Int64 { #if arch(wasm32) - let ret = setFileSize(_: FileSize.bridgeJSLiftParameter(size)) + let size = FileSize.bridgeJSLiftParameter(size) + let ret = setFileSize(_: size) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9656,7 +11317,8 @@ public func _bjs_getFileSize() -> Int64 { @_cdecl("bjs_setSessionId") public func _bjs_setSessionId(_ session: Int64) -> Int64 { #if arch(wasm32) - let ret = setSessionId(_: SessionId.bridgeJSLiftParameter(session)) + let session = SessionId.bridgeJSLiftParameter(session) + let ret = setSessionId(_: session) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9678,7 +11340,8 @@ public func _bjs_getSessionId() -> Int64 { @_cdecl("bjs_processTheme") public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int32 { #if arch(wasm32) - let ret = processTheme(_: Theme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = Theme.bridgeJSLiftParameter(themeBytes, themeLength) + let ret = processTheme(_: theme) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9689,7 +11352,8 @@ public func _bjs_processTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Int3 @_cdecl("bjs_setTSDirection") public func _bjs_setTSDirection(_ direction: Int32) -> Int32 { #if arch(wasm32) - let ret = setTSDirection(_: TSDirection.bridgeJSLiftParameter(direction)) + let direction = TSDirection.bridgeJSLiftParameter(direction) + let ret = setTSDirection(_: direction) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9711,7 +11375,8 @@ public func _bjs_getTSDirection() -> Int32 { @_cdecl("bjs_setTSTheme") public func _bjs_setTSTheme(_ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - let ret = setTSTheme(_: TSTheme.bridgeJSLiftParameter(themeBytes, themeLength)) + let theme = TSTheme.bridgeJSLiftParameter(themeBytes, themeLength) + let ret = setTSTheme(_: theme) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9744,7 +11409,9 @@ public func _bjs_createConverter() -> UnsafeMutableRawPointer { @_cdecl("bjs_useConverter") public func _bjs_useConverter(_ converter: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = useConverter(converter: Utils.Converter.bridgeJSLiftParameter(converter), value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let converter = Utils.Converter.bridgeJSLiftParameter(converter) + let ret = useConverter(converter: converter, value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9755,7 +11422,8 @@ public func _bjs_useConverter(_ converter: UnsafeMutableRawPointer, _ value: Int @_cdecl("bjs_roundTripConverterArray") public func _bjs_roundTripConverterArray() -> Void { #if arch(wasm32) - let ret = roundTripConverterArray(_: [Utils.Converter].bridgeJSStackPop()) + let converters = [Utils.Converter].bridgeJSStackPop() + let ret = roundTripConverterArray(_: converters) ret.bridgeJSStackPush() #else fatalError("Only available on WebAssembly") @@ -9777,7 +11445,8 @@ public func _bjs_createHTTPServer() -> UnsafeMutableRawPointer { @_cdecl("bjs_createUUID") public func _bjs_createUUID(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = createUUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = createUUID(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9788,7 +11457,8 @@ public func _bjs_createUUID(_ valueBytes: Int32, _ valueLength: Int32) -> Unsafe @_cdecl("bjs_roundTripUUID") public func _bjs_roundTripUUID(_ uuid: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = roundTripUUID(_: UUID.bridgeJSLiftParameter(uuid)) + let uuid = UUID.bridgeJSLiftParameter(uuid) + let ret = roundTripUUID(_: uuid) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9799,7 +11469,8 @@ public func _bjs_roundTripUUID(_ uuid: UnsafeMutableRawPointer) -> UnsafeMutable @_cdecl("bjs_roundtripNetworkingAPIMethod") public func _bjs_roundtripNetworkingAPIMethod(_ method: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripNetworkingAPIMethod(_: Networking.API.Method.bridgeJSLiftParameter(method)) + let method = Networking.API.Method.bridgeJSLiftParameter(method) + let ret = roundtripNetworkingAPIMethod(_: method) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9810,7 +11481,8 @@ public func _bjs_roundtripNetworkingAPIMethod(_ method: Int32) -> Int32 { @_cdecl("bjs_roundtripConfigurationLogLevel") public func _bjs_roundtripConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Void { #if arch(wasm32) - let ret = roundtripConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength)) + let level = Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength) + let ret = roundtripConfigurationLogLevel(_: level) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9821,7 +11493,8 @@ public func _bjs_roundtripConfigurationLogLevel(_ levelBytes: Int32, _ levelLeng @_cdecl("bjs_roundtripConfigurationPort") public func _bjs_roundtripConfigurationPort(_ port: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripConfigurationPort(_: Configuration.Port.bridgeJSLiftParameter(port)) + let port = Configuration.Port.bridgeJSLiftParameter(port) + let ret = roundtripConfigurationPort(_: port) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9832,7 +11505,8 @@ public func _bjs_roundtripConfigurationPort(_ port: Int32) -> Int32 { @_cdecl("bjs_processConfigurationLogLevel") public func _bjs_processConfigurationLogLevel(_ levelBytes: Int32, _ levelLength: Int32) -> Int32 { #if arch(wasm32) - let ret = processConfigurationLogLevel(_: Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength)) + let level = Configuration.LogLevel.bridgeJSLiftParameter(levelBytes, levelLength) + let ret = processConfigurationLogLevel(_: level) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9843,7 +11517,8 @@ public func _bjs_processConfigurationLogLevel(_ levelBytes: Int32, _ levelLength @_cdecl("bjs_roundtripInternalSupportedMethod") public func _bjs_roundtripInternalSupportedMethod(_ method: Int32) -> Int32 { #if arch(wasm32) - let ret = roundtripInternalSupportedMethod(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) + let method = Internal.SupportedMethod.bridgeJSLiftParameter(method) + let ret = roundtripInternalSupportedMethod(_: method) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9854,7 +11529,8 @@ public func _bjs_roundtripInternalSupportedMethod(_ method: Int32) -> Int32 { @_cdecl("bjs_roundtripAPIResult") public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripAPIResult(result: APIResult.bridgeJSLiftParameter(result)) + let result = APIResult.bridgeJSLiftParameter(result) + let ret = roundtripAPIResult(result: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9865,7 +11541,8 @@ public func _bjs_roundtripAPIResult(_ result: Int32) -> Void { @_cdecl("bjs_makeAPIResultSuccess") public func _bjs_makeAPIResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = makeAPIResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = makeAPIResultSuccess(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9876,7 +11553,8 @@ public func _bjs_makeAPIResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) @_cdecl("bjs_makeAPIResultFailure") public func _bjs_makeAPIResultFailure(_ value: Int32) -> Void { #if arch(wasm32) - let ret = makeAPIResultFailure(_: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = makeAPIResultFailure(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9898,7 +11576,8 @@ public func _bjs_makeAPIResultInfo() -> Void { @_cdecl("bjs_makeAPIResultFlag") public func _bjs_makeAPIResultFlag(_ value: Int32) -> Void { #if arch(wasm32) - let ret = makeAPIResultFlag(_: Bool.bridgeJSLiftParameter(value)) + let value = Bool.bridgeJSLiftParameter(value) + let ret = makeAPIResultFlag(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9909,7 +11588,8 @@ public func _bjs_makeAPIResultFlag(_ value: Int32) -> Void { @_cdecl("bjs_makeAPIResultRate") public func _bjs_makeAPIResultRate(_ value: Float32) -> Void { #if arch(wasm32) - let ret = makeAPIResultRate(_: Float.bridgeJSLiftParameter(value)) + let value = Float.bridgeJSLiftParameter(value) + let ret = makeAPIResultRate(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9920,7 +11600,8 @@ public func _bjs_makeAPIResultRate(_ value: Float32) -> Void { @_cdecl("bjs_makeAPIResultPrecise") public func _bjs_makeAPIResultPrecise(_ value: Float64) -> Void { #if arch(wasm32) - let ret = makeAPIResultPrecise(_: Double.bridgeJSLiftParameter(value)) + let value = Double.bridgeJSLiftParameter(value) + let ret = makeAPIResultPrecise(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9931,7 +11612,8 @@ public func _bjs_makeAPIResultPrecise(_ value: Float64) -> Void { @_cdecl("bjs_roundtripComplexResult") public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripComplexResult(_: ComplexResult.bridgeJSLiftParameter(result)) + let result = ComplexResult.bridgeJSLiftParameter(result) + let ret = roundtripComplexResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9942,7 +11624,8 @@ public func _bjs_roundtripComplexResult(_ result: Int32) -> Void { @_cdecl("bjs_makeComplexResultSuccess") public func _bjs_makeComplexResultSuccess(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = makeComplexResultSuccess(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = makeComplexResultSuccess(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9953,7 +11636,9 @@ public func _bjs_makeComplexResultSuccess(_ valueBytes: Int32, _ valueLength: In @_cdecl("bjs_makeComplexResultError") public func _bjs_makeComplexResultError(_ messageBytes: Int32, _ messageLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) - let ret = makeComplexResultError(_: String.bridgeJSLiftParameter(messageBytes, messageLength), _: Int.bridgeJSLiftParameter(code)) + let code = Int.bridgeJSLiftParameter(code) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let ret = makeComplexResultError(_: message, _: code) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9964,7 +11649,10 @@ public func _bjs_makeComplexResultError(_ messageBytes: Int32, _ messageLength: @_cdecl("bjs_makeComplexResultLocation") public func _bjs_makeComplexResultLocation(_ lat: Float64, _ lng: Float64, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = makeComplexResultLocation(_: Double.bridgeJSLiftParameter(lat), _: Double.bridgeJSLiftParameter(lng), _: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let lng = Double.bridgeJSLiftParameter(lng) + let lat = Double.bridgeJSLiftParameter(lat) + let ret = makeComplexResultLocation(_: lat, _: lng, _: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9975,7 +11663,10 @@ public func _bjs_makeComplexResultLocation(_ lat: Float64, _ lng: Float64, _ nam @_cdecl("bjs_makeComplexResultStatus") public func _bjs_makeComplexResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = makeComplexResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let code = Int.bridgeJSLiftParameter(code) + let active = Bool.bridgeJSLiftParameter(active) + let ret = makeComplexResultStatus(_: active, _: code, _: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9986,7 +11677,10 @@ public func _bjs_makeComplexResultStatus(_ active: Int32, _ code: Int32, _ messa @_cdecl("bjs_makeComplexResultCoordinates") public func _bjs_makeComplexResultCoordinates(_ x: Float64, _ y: Float64, _ z: Float64) -> Void { #if arch(wasm32) - let ret = makeComplexResultCoordinates(_: Double.bridgeJSLiftParameter(x), _: Double.bridgeJSLiftParameter(y), _: Double.bridgeJSLiftParameter(z)) + let z = Double.bridgeJSLiftParameter(z) + let y = Double.bridgeJSLiftParameter(y) + let x = Double.bridgeJSLiftParameter(x) + let ret = makeComplexResultCoordinates(_: x, _: y, _: z) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -9997,7 +11691,16 @@ public func _bjs_makeComplexResultCoordinates(_ x: Float64, _ y: Float64, _ z: F @_cdecl("bjs_makeComplexResultComprehensive") public func _bjs_makeComplexResultComprehensive(_ flag1: Int32, _ flag2: Int32, _ count1: Int32, _ count2: Int32, _ value1: Float64, _ value2: Float64, _ text1Bytes: Int32, _ text1Length: Int32, _ text2Bytes: Int32, _ text2Length: Int32, _ text3Bytes: Int32, _ text3Length: Int32) -> Void { #if arch(wasm32) - let ret = makeComplexResultComprehensive(_: Bool.bridgeJSLiftParameter(flag1), _: Bool.bridgeJSLiftParameter(flag2), _: Int.bridgeJSLiftParameter(count1), _: Int.bridgeJSLiftParameter(count2), _: Double.bridgeJSLiftParameter(value1), _: Double.bridgeJSLiftParameter(value2), _: String.bridgeJSLiftParameter(text1Bytes, text1Length), _: String.bridgeJSLiftParameter(text2Bytes, text2Length), _: String.bridgeJSLiftParameter(text3Bytes, text3Length)) + let text3 = String.bridgeJSLiftParameter(text3Bytes, text3Length) + let text2 = String.bridgeJSLiftParameter(text2Bytes, text2Length) + let text1 = String.bridgeJSLiftParameter(text1Bytes, text1Length) + let value2 = Double.bridgeJSLiftParameter(value2) + let value1 = Double.bridgeJSLiftParameter(value1) + let count2 = Int.bridgeJSLiftParameter(count2) + let count1 = Int.bridgeJSLiftParameter(count1) + let flag2 = Bool.bridgeJSLiftParameter(flag2) + let flag1 = Bool.bridgeJSLiftParameter(flag1) + let ret = makeComplexResultComprehensive(_: flag1, _: flag2, _: count1, _: count2, _: value1, _: value2, _: text1, _: text2, _: text3) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10019,7 +11722,8 @@ public func _bjs_makeComplexResultInfo() -> Void { @_cdecl("bjs_makeUtilitiesResultSuccess") public func _bjs_makeUtilitiesResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = makeUtilitiesResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let ret = makeUtilitiesResultSuccess(_: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10030,7 +11734,9 @@ public func _bjs_makeUtilitiesResultSuccess(_ messageBytes: Int32, _ messageLeng @_cdecl("bjs_makeUtilitiesResultFailure") public func _bjs_makeUtilitiesResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) - let ret = makeUtilitiesResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code)) + let code = Int.bridgeJSLiftParameter(code) + let error = String.bridgeJSLiftParameter(errorBytes, errorLength) + let ret = makeUtilitiesResultFailure(_: error, _: code) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10041,7 +11747,10 @@ public func _bjs_makeUtilitiesResultFailure(_ errorBytes: Int32, _ errorLength: @_cdecl("bjs_makeUtilitiesResultStatus") public func _bjs_makeUtilitiesResultStatus(_ active: Int32, _ code: Int32, _ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = makeUtilitiesResultStatus(_: Bool.bridgeJSLiftParameter(active), _: Int.bridgeJSLiftParameter(code), _: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let code = Int.bridgeJSLiftParameter(code) + let active = Bool.bridgeJSLiftParameter(active) + let ret = makeUtilitiesResultStatus(_: active, _: code, _: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10052,7 +11761,8 @@ public func _bjs_makeUtilitiesResultStatus(_ active: Int32, _ code: Int32, _ mes @_cdecl("bjs_makeAPINetworkingResultSuccess") public func _bjs_makeAPINetworkingResultSuccess(_ messageBytes: Int32, _ messageLength: Int32) -> Void { #if arch(wasm32) - let ret = makeAPINetworkingResultSuccess(_: String.bridgeJSLiftParameter(messageBytes, messageLength)) + let message = String.bridgeJSLiftParameter(messageBytes, messageLength) + let ret = makeAPINetworkingResultSuccess(_: message) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10063,7 +11773,9 @@ public func _bjs_makeAPINetworkingResultSuccess(_ messageBytes: Int32, _ message @_cdecl("bjs_makeAPINetworkingResultFailure") public func _bjs_makeAPINetworkingResultFailure(_ errorBytes: Int32, _ errorLength: Int32, _ code: Int32) -> Void { #if arch(wasm32) - let ret = makeAPINetworkingResultFailure(_: String.bridgeJSLiftParameter(errorBytes, errorLength), _: Int.bridgeJSLiftParameter(code)) + let code = Int.bridgeJSLiftParameter(code) + let error = String.bridgeJSLiftParameter(errorBytes, errorLength) + let ret = makeAPINetworkingResultFailure(_: error, _: code) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10074,7 +11786,8 @@ public func _bjs_makeAPINetworkingResultFailure(_ errorBytes: Int32, _ errorLeng @_cdecl("bjs_roundtripUtilitiesResult") public func _bjs_roundtripUtilitiesResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripUtilitiesResult(_: Utilities.Result.bridgeJSLiftParameter(result)) + let result = Utilities.Result.bridgeJSLiftParameter(result) + let ret = roundtripUtilitiesResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10085,7 +11798,8 @@ public func _bjs_roundtripUtilitiesResult(_ result: Int32) -> Void { @_cdecl("bjs_roundtripAPINetworkingResult") public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundtripAPINetworkingResult(_: API.NetworkingResult.bridgeJSLiftParameter(result)) + let result = API.NetworkingResult.bridgeJSLiftParameter(result) + let ret = roundtripAPINetworkingResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10096,7 +11810,8 @@ public func _bjs_roundtripAPINetworkingResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripAllTypesResult") public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripAllTypesResult(_: AllTypesResult.bridgeJSLiftParameter(result)) + let result = AllTypesResult.bridgeJSLiftParameter(result) + let ret = roundTripAllTypesResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10107,7 +11822,8 @@ public func _bjs_roundTripAllTypesResult(_ result: Int32) -> Void { @_cdecl("bjs_roundTripTypedPayloadResult") public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { #if arch(wasm32) - let ret = roundTripTypedPayloadResult(_: TypedPayloadResult.bridgeJSLiftParameter(result)) + let result = TypedPayloadResult.bridgeJSLiftParameter(result) + let ret = roundTripTypedPayloadResult(_: result) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10118,7 +11834,13 @@ public func _bjs_roundTripTypedPayloadResult(_ result: Int32) -> Void { @_cdecl("bjs_createPropertyHolder") public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = createPropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject)) + let jsObject = JSObject.bridgeJSLiftParameter(jsObject) + let stringValue = String.bridgeJSLiftParameter(stringValueBytes, stringValueLength) + let boolValue = Bool.bridgeJSLiftParameter(boolValue) + let doubleValue = Double.bridgeJSLiftParameter(doubleValue) + let floatValue = Float.bridgeJSLiftParameter(floatValue) + let intValue = Int.bridgeJSLiftParameter(intValue) + let ret = createPropertyHolder(intValue: intValue, floatValue: floatValue, doubleValue: doubleValue, boolValue: boolValue, stringValue: stringValue, jsObject: jsObject) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10129,7 +11851,8 @@ public func _bjs_createPropertyHolder(_ intValue: Int32, _ floatValue: Float32, @_cdecl("bjs_testPropertyHolder") public func _bjs_testPropertyHolder(_ holder: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = testPropertyHolder(holder: PropertyHolder.bridgeJSLiftParameter(holder)) + let holder = PropertyHolder.bridgeJSLiftParameter(holder) + let ret = testPropertyHolder(holder: holder) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10161,7 +11884,9 @@ public func _bjs_getObserverStats() -> Void { @_cdecl("bjs_formatName") public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform: Int32) -> Void { #if arch(wasm32) - let ret = formatName(_: String.bridgeJSLiftParameter(nameBytes, nameLength), transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) + let transform = _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = formatName(_: name, transform: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10172,7 +11897,8 @@ public func _bjs_formatName(_ nameBytes: Int32, _ nameLength: Int32, _ transform @_cdecl("bjs_makeFormatter") public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { #if arch(wasm32) - let ret = makeFormatter(prefix: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let ret = makeFormatter(prefix: prefix) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10183,7 +11909,8 @@ public func _bjs_makeFormatter(_ prefixBytes: Int32, _ prefixLength: Int32) -> I @_cdecl("bjs_makeAdder") public func _bjs_makeAdder(_ base: Int32) -> Int32 { #if arch(wasm32) - let ret = makeAdder(base: Int.bridgeJSLiftParameter(base)) + let base = Int.bridgeJSLiftParameter(base) + let ret = makeAdder(base: base) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10194,7 +11921,32 @@ public func _bjs_makeAdder(_ base: Int32) -> Int32 { @_cdecl("bjs_roundTripMessage") public func _bjs_roundTripMessage(_ message: Int32) -> Void { #if arch(wasm32) - let ret = roundTripMessage(_: Message.bridgeJSLiftParameter(message)) + let message = Message.bridgeJSLiftParameter(message) + let ret = roundTripMessage(_: message) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeRefinedEntity") +@_cdecl("bjs_describeRefinedEntity") +public func _bjs_describeRefinedEntity(_ entity: Int32) -> Void { + #if arch(wasm32) + let entity = AnyRefineEntity.bridgeJSLiftParameter(entity) + let ret = describeRefinedEntity(_: entity) + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_describeTaggedEntity") +@_cdecl("bjs_describeTaggedEntity") +public func _bjs_describeTaggedEntity(_ entity: Int32) -> Void { + #if arch(wasm32) + let entity = AnyRefineTagged.bridgeJSLiftParameter(entity) + let ret = describeTaggedEntity(_: entity) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10205,7 +11957,8 @@ public func _bjs_roundTripMessage(_ message: Int32) -> Void { @_cdecl("bjs_renamedEcho") public func _bjs_renamedEcho(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - let ret = jsNameEcho(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = jsNameEcho(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10216,7 +11969,8 @@ public func _bjs_renamedEcho(_ valueBytes: Int32, _ valueLength: Int32) -> Void @_cdecl("bjs_greetName") public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - let ret = greet(_: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = greet(_: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10227,7 +11981,8 @@ public func _bjs_greetName(_ nameBytes: Int32, _ nameLength: Int32) -> Void { @_cdecl("bjs_greetCount") public func _bjs_greetCount(_ count: Int32) -> Void { #if arch(wasm32) - let ret = greet(_: Int.bridgeJSLiftParameter(count)) + let count = Int.bridgeJSLiftParameter(count) + let ret = greet(_: count) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10238,7 +11993,8 @@ public func _bjs_greetCount(_ count: Int32) -> Void { @_cdecl("bjs_roundTripPointerFields") public func _bjs_roundTripPointerFields() -> Void { #if arch(wasm32) - let ret = roundTripPointerFields(_: PointerFields.bridgeJSLiftParameter()) + let value = PointerFields.bridgeJSLiftParameter() + let ret = roundTripPointerFields(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10249,7 +12005,8 @@ public func _bjs_roundTripPointerFields() -> Void { @_cdecl("bjs_testStructDefault") public func _bjs_testStructDefault() -> Void { #if arch(wasm32) - let ret = testStructDefault(point: DataPoint.bridgeJSLiftParameter()) + let point = DataPoint.bridgeJSLiftParameter() + let ret = testStructDefault(point: point) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10260,7 +12017,8 @@ public func _bjs_testStructDefault() -> Void { @_cdecl("bjs_cartToJSObject") public func _bjs_cartToJSObject() -> Int32 { #if arch(wasm32) - let ret = cartToJSObject(_: CopyableCart.bridgeJSLiftParameter()) + let cart = CopyableCart.bridgeJSLiftParameter() + let ret = cartToJSObject(_: cart) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10271,7 +12029,8 @@ public func _bjs_cartToJSObject() -> Int32 { @_cdecl("bjs_nestedCartToJSObject") public func _bjs_nestedCartToJSObject() -> Int32 { #if arch(wasm32) - let ret = nestedCartToJSObject(_: CopyableNestedCart.bridgeJSLiftParameter()) + let cart = CopyableNestedCart.bridgeJSLiftParameter() + let ret = nestedCartToJSObject(_: cart) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10282,7 +12041,8 @@ public func _bjs_nestedCartToJSObject() -> Int32 { @_cdecl("bjs_roundTripDataPoint") public func _bjs_roundTripDataPoint() -> Void { #if arch(wasm32) - let ret = roundTripDataPoint(_: DataPoint.bridgeJSLiftParameter()) + let data = DataPoint.bridgeJSLiftParameter() + let ret = roundTripDataPoint(_: data) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10293,7 +12053,8 @@ public func _bjs_roundTripDataPoint() -> Void { @_cdecl("bjs_roundTripPublicPoint") public func _bjs_roundTripPublicPoint() -> Void { #if arch(wasm32) - let ret = roundTripPublicPoint(_: PublicPoint.bridgeJSLiftParameter()) + let point = PublicPoint.bridgeJSLiftParameter() + let ret = roundTripPublicPoint(_: point) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10304,9 +12065,9 @@ public func _bjs_roundTripPublicPoint() -> Void { @_cdecl("bjs_asyncRoundTripPublicPoint") public func _bjs_asyncRoundTripPublicPoint() -> Int32 { #if arch(wasm32) - let _tmp_point = PublicPoint.bridgeJSLiftParameter() + let point = PublicPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { - return await asyncRoundTripPublicPoint(_: _tmp_point) + return await asyncRoundTripPublicPoint(_: point) } #else fatalError("Only available on WebAssembly") @@ -10317,9 +12078,9 @@ public func _bjs_asyncRoundTripPublicPoint() -> Int32 { @_cdecl("bjs_asyncRoundTripPublicPointThrows") public func _bjs_asyncRoundTripPublicPointThrows() -> Int32 { #if arch(wasm32) - let _tmp_point = PublicPoint.bridgeJSLiftParameter() + let point = PublicPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { () async throws(JSException) -> PublicPoint in - return try await asyncRoundTripPublicPointThrows(_: _tmp_point) + return try await asyncRoundTripPublicPointThrows(_: point) } #else fatalError("Only available on WebAssembly") @@ -10330,8 +12091,9 @@ public func _bjs_asyncRoundTripPublicPointThrows() -> Int32 { @_cdecl("bjs_asyncStructOrThrow") public func _bjs_asyncStructOrThrow(_ shouldThrow: Int32) -> Int32 { #if arch(wasm32) + let shouldThrow = Bool.bridgeJSLiftParameter(shouldThrow) return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { () async throws(JSException) -> PublicPoint in - return try await asyncStructOrThrow(_: Bool.bridgeJSLiftParameter(shouldThrow)) + return try await asyncStructOrThrow(_: shouldThrow) } #else fatalError("Only available on WebAssembly") @@ -10342,10 +12104,10 @@ public func _bjs_asyncStructOrThrow(_ shouldThrow: Int32) -> Int32 { @_cdecl("bjs_asyncCombinePublicPoints") public func _bjs_asyncCombinePublicPoints() -> Int32 { #if arch(wasm32) - let _tmp_b = PublicPoint.bridgeJSLiftParameter() - let _tmp_a = PublicPoint.bridgeJSLiftParameter() + let b = PublicPoint.bridgeJSLiftParameter() + let a = PublicPoint.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { - return await asyncCombinePublicPoints(_: _tmp_a, _: _tmp_b) + return await asyncCombinePublicPoints(_: a, _: b) } #else fatalError("Only available on WebAssembly") @@ -10356,9 +12118,9 @@ public func _bjs_asyncCombinePublicPoints() -> Int32 { @_cdecl("bjs_asyncRoundTripContact") public func _bjs_asyncRoundTripContact() -> Int32 { #if arch(wasm32) - let _tmp_contact = Contact.bridgeJSLiftParameter() + let contact = Contact.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_7ContactV, reject: Promise_reject) { - return await asyncRoundTripContact(_: _tmp_contact) + return await asyncRoundTripContact(_: contact) } #else fatalError("Only available on WebAssembly") @@ -10369,9 +12131,9 @@ public func _bjs_asyncRoundTripContact() -> Int32 { @_cdecl("bjs_asyncRoundTripPublicPointArray") public func _bjs_asyncRoundTripPublicPointArray() -> Int32 { #if arch(wasm32) - let _tmp_points = [PublicPoint].bridgeJSStackPop() + let points = [PublicPoint].bridgeJSStackPop() return _bjs_makePromise(resolve: Promise_resolve_Sa11PublicPointV, reject: Promise_reject) { - return await asyncRoundTripPublicPointArray(_: _tmp_points) + return await asyncRoundTripPublicPointArray(_: points) } #else fatalError("Only available on WebAssembly") @@ -10382,9 +12144,9 @@ public func _bjs_asyncRoundTripPublicPointArray() -> Int32 { @_cdecl("bjs_asyncRoundTripOptionalPublicPoint") public func _bjs_asyncRoundTripOptionalPublicPoint() -> Int32 { #if arch(wasm32) - let _tmp_point = Optional.bridgeJSLiftParameter() + let point = Optional.bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_Sq11PublicPointV, reject: Promise_reject) { - return await asyncRoundTripOptionalPublicPoint(_: _tmp_point) + return await asyncRoundTripOptionalPublicPoint(_: point) } #else fatalError("Only available on WebAssembly") @@ -10395,9 +12157,9 @@ public func _bjs_asyncRoundTripOptionalPublicPoint() -> Int32 { @_cdecl("bjs_asyncRoundTripPublicPointDict") public func _bjs_asyncRoundTripPublicPointDict() -> Int32 { #if arch(wasm32) - let _tmp_points = [String: PublicPoint].bridgeJSLiftParameter() + let points = [String: PublicPoint].bridgeJSLiftParameter() return _bjs_makePromise(resolve: Promise_resolve_SD11PublicPointV, reject: Promise_reject) { - return await asyncRoundTripPublicPointDict(_: _tmp_points) + return await asyncRoundTripPublicPointDict(_: points) } #else fatalError("Only available on WebAssembly") @@ -10408,7 +12170,8 @@ public func _bjs_asyncRoundTripPublicPointDict() -> Int32 { @_cdecl("bjs_roundTripContact") public func _bjs_roundTripContact() -> Void { #if arch(wasm32) - let ret = roundTripContact(_: Contact.bridgeJSLiftParameter()) + let contact = Contact.bridgeJSLiftParameter() + let ret = roundTripContact(_: contact) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10419,7 +12182,8 @@ public func _bjs_roundTripContact() -> Void { @_cdecl("bjs_roundTripConfig") public func _bjs_roundTripConfig() -> Void { #if arch(wasm32) - let ret = roundTripConfig(_: Config.bridgeJSLiftParameter()) + let config = Config.bridgeJSLiftParameter() + let ret = roundTripConfig(_: config) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10430,7 +12194,8 @@ public func _bjs_roundTripConfig() -> Void { @_cdecl("bjs_roundTripSessionData") public func _bjs_roundTripSessionData() -> Void { #if arch(wasm32) - let ret = roundTripSessionData(_: SessionData.bridgeJSLiftParameter()) + let session = SessionData.bridgeJSLiftParameter() + let ret = roundTripSessionData(_: session) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10441,7 +12206,8 @@ public func _bjs_roundTripSessionData() -> Void { @_cdecl("bjs_roundTripValidationReport") public func _bjs_roundTripValidationReport() -> Void { #if arch(wasm32) - let ret = roundTripValidationReport(_: ValidationReport.bridgeJSLiftParameter()) + let report = ValidationReport.bridgeJSLiftParameter() + let ret = roundTripValidationReport(_: report) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10452,7 +12218,8 @@ public func _bjs_roundTripValidationReport() -> Void { @_cdecl("bjs_roundTripAdvancedConfig") public func _bjs_roundTripAdvancedConfig() -> Void { #if arch(wasm32) - let ret = roundTripAdvancedConfig(_: AdvancedConfig.bridgeJSLiftParameter()) + let config = AdvancedConfig.bridgeJSLiftParameter() + let ret = roundTripAdvancedConfig(_: config) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10463,7 +12230,8 @@ public func _bjs_roundTripAdvancedConfig() -> Void { @_cdecl("bjs_roundTripMeasurementConfig") public func _bjs_roundTripMeasurementConfig() -> Void { #if arch(wasm32) - let ret = roundTripMeasurementConfig(_: MeasurementConfig.bridgeJSLiftParameter()) + let config = MeasurementConfig.bridgeJSLiftParameter() + let ret = roundTripMeasurementConfig(_: config) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10474,9 +12242,9 @@ public func _bjs_roundTripMeasurementConfig() -> Void { @_cdecl("bjs_updateValidationReport") public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCaseId: Int32) -> Void { #if arch(wasm32) - let _tmp_report = ValidationReport.bridgeJSLiftParameter() - let _tmp_newResult = Optional.bridgeJSLiftParameter(newResultIsSome, newResultCaseId) - let ret = updateValidationReport(_: _tmp_newResult, _: _tmp_report) + let report = ValidationReport.bridgeJSLiftParameter() + let newResult = Optional.bridgeJSLiftParameter(newResultIsSome, newResultCaseId) + let ret = updateValidationReport(_: newResult, _: report) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10487,7 +12255,8 @@ public func _bjs_updateValidationReport(_ newResultIsSome: Int32, _ newResultCas @_cdecl("bjs_testContainerWithStruct") public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = testContainerWithStruct(_: DataPoint.bridgeJSLiftParameter()) + let point = DataPoint.bridgeJSLiftParameter() + let ret = testContainerWithStruct(_: point) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10498,7 +12267,8 @@ public func _bjs_testContainerWithStruct() -> UnsafeMutableRawPointer { @_cdecl("bjs_roundTripJSObjectContainer") public func _bjs_roundTripJSObjectContainer() -> Void { #if arch(wasm32) - let ret = roundTripJSObjectContainer(_: JSObjectContainer.bridgeJSLiftParameter()) + let container = JSObjectContainer.bridgeJSLiftParameter() + let ret = roundTripJSObjectContainer(_: container) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10509,7 +12279,8 @@ public func _bjs_roundTripJSObjectContainer() -> Void { @_cdecl("bjs_roundTripFooContainer") public func _bjs_roundTripFooContainer() -> Void { #if arch(wasm32) - let ret = roundTripFooContainer(_: FooContainer.bridgeJSLiftParameter()) + let container = FooContainer.bridgeJSLiftParameter() + let ret = roundTripFooContainer(_: container) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10520,7 +12291,8 @@ public func _bjs_roundTripFooContainer() -> Void { @_cdecl("bjs_roundTripArrayMembers") public func _bjs_roundTripArrayMembers() -> Void { #if arch(wasm32) - let ret = roundTripArrayMembers(_: ArrayMembers.bridgeJSLiftParameter()) + let value = ArrayMembers.bridgeJSLiftParameter() + let ret = roundTripArrayMembers(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10531,9 +12303,9 @@ public func _bjs_roundTripArrayMembers() -> Void { @_cdecl("bjs_arrayMembersSum") public func _bjs_arrayMembersSum() -> Int32 { #if arch(wasm32) - let _tmp_values = [Int].bridgeJSStackPop() - let _tmp_value = ArrayMembers.bridgeJSLiftParameter() - let ret = arrayMembersSum(_: _tmp_value, _: _tmp_values) + let values = [Int].bridgeJSStackPop() + let value = ArrayMembers.bridgeJSLiftParameter() + let ret = arrayMembersSum(_: value, _: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10544,9 +12316,9 @@ public func _bjs_arrayMembersSum() -> Int32 { @_cdecl("bjs_arrayMembersFirst") public func _bjs_arrayMembersFirst() -> Void { #if arch(wasm32) - let _tmp_values = [String].bridgeJSStackPop() - let _tmp_value = ArrayMembers.bridgeJSLiftParameter() - let ret = arrayMembersFirst(_: _tmp_value, _: _tmp_values) + let values = [String].bridgeJSStackPop() + let value = ArrayMembers.bridgeJSLiftParameter() + let ret = arrayMembersFirst(_: value, _: values) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10557,7 +12329,9 @@ public func _bjs_arrayMembersFirst() -> Void { @_cdecl("bjs_PolygonReference_init") public func _bjs_PolygonReference_init(_ labelBytes: Int32, _ labelLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference(verticesData: [Double].bridgeJSStackPop(), label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let verticesData = [Double].bridgeJSStackPop() + let ret = PolygonReference(verticesData: verticesData, label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10568,7 +12342,8 @@ public func _bjs_PolygonReference_init(_ labelBytes: Int32, _ labelLength: Int32 @_cdecl("bjs_PolygonReference_vertexCount") public func _bjs_PolygonReference_vertexCount(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).vertexCount() + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.vertexCount() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10579,7 +12354,8 @@ public func _bjs_PolygonReference_vertexCount(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PolygonReference_summary") public func _bjs_PolygonReference_summary(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).summary() + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.summary() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10590,7 +12366,8 @@ public func _bjs_PolygonReference_summary(_ _self: UnsafeMutableRawPointer) -> V @_cdecl("bjs_PolygonReference_snapshot") public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).snapshot() + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.snapshot() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10601,7 +12378,9 @@ public func _bjs_PolygonReference_snapshot(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_PolygonReference_merge") public func _bjs_PolygonReference_merge(_ _self: UnsafeMutableRawPointer, _ other: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference.bridgeJSLiftParameter(_self).merge(_: Polygon.bridgeJSLiftParameter(other)) + let other = Polygon.bridgeJSLiftParameter(other) + let _self = PolygonReference.bridgeJSLiftParameter(_self) + let ret = _self.merge(_: other) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10612,7 +12391,8 @@ public func _bjs_PolygonReference_merge(_ _self: UnsafeMutableRawPointer, _ othe @_cdecl("bjs_PolygonReference_static_origin") public func _bjs_PolygonReference_static_origin(_ labelBytes: Int32, _ labelLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PolygonReference.origin(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let ret = PolygonReference.origin(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10654,7 +12434,8 @@ fileprivate func _bjs_PolygonReference_wrap_extern(_ pointer: UnsafeMutableRawPo @_cdecl("bjs_TagReference_describe") public func _bjs_TagReference_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TagReference.bridgeJSLiftParameter(_self).describe() + let _self = TagReference.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10696,7 +12477,9 @@ fileprivate func _bjs_TagReference_wrap_extern(_ pointer: UnsafeMutableRawPointe @_cdecl("bjs_TagHolderReference_init") public func _bjs_TagHolderReference_init(_ tag: UnsafeMutableRawPointer, _ version: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TagHolderReference(tag: Tag.bridgeJSLiftParameter(tag), version: Int.bridgeJSLiftParameter(version)) + let version = Int.bridgeJSLiftParameter(version) + let tag = Tag.bridgeJSLiftParameter(tag) + let ret = TagHolderReference(tag: tag, version: version) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10707,7 +12490,8 @@ public func _bjs_TagHolderReference_init(_ tag: UnsafeMutableRawPointer, _ versi @_cdecl("bjs_TagHolderReference_describe") public func _bjs_TagHolderReference_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = TagHolderReference.bridgeJSLiftParameter(_self).describe() + let _self = TagHolderReference.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10718,7 +12502,8 @@ public func _bjs_TagHolderReference_describe(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_TagHolderReference_tag_get") public func _bjs_TagHolderReference_tag_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TagHolderReference.bridgeJSLiftParameter(_self).tag + let _self = TagHolderReference.bridgeJSLiftParameter(_self) + let ret = _self.tag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10729,7 +12514,9 @@ public func _bjs_TagHolderReference_tag_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_TagHolderReference_tag_set") public func _bjs_TagHolderReference_tag_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - TagHolderReference.bridgeJSLiftParameter(_self).tag = Tag.bridgeJSLiftParameter(value) + let value = Tag.bridgeJSLiftParameter(value) + let _self = TagHolderReference.bridgeJSLiftParameter(_self) + _self.tag = value #else fatalError("Only available on WebAssembly") #endif @@ -10739,7 +12526,8 @@ public func _bjs_TagHolderReference_tag_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_TagHolderReference_version_get") public func _bjs_TagHolderReference_version_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TagHolderReference.bridgeJSLiftParameter(_self).version + let _self = TagHolderReference.bridgeJSLiftParameter(_self) + let ret = _self.version return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10750,7 +12538,9 @@ public func _bjs_TagHolderReference_version_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_TagHolderReference_version_set") public func _bjs_TagHolderReference_version_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - TagHolderReference.bridgeJSLiftParameter(_self).version = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = TagHolderReference.bridgeJSLiftParameter(_self) + _self.version = value #else fatalError("Only available on WebAssembly") #endif @@ -10791,7 +12581,8 @@ fileprivate func _bjs_TagHolderReference_wrap_extern(_ pointer: UnsafeMutableRaw @_cdecl("bjs_PriorityReference_describe") public func _bjs_PriorityReference_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PriorityReference.bridgeJSLiftParameter(_self).describe() + let _self = PriorityReference.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10802,7 +12593,8 @@ public func _bjs_PriorityReference_describe(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_PriorityReference_weight") public func _bjs_PriorityReference_weight(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PriorityReference.bridgeJSLiftParameter(_self).weight() + let _self = PriorityReference.bridgeJSLiftParameter(_self) + let ret = _self.weight() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10877,7 +12669,8 @@ fileprivate func _bjs_PriorityReference_wrap_extern(_ pointer: UnsafeMutableRawP @_cdecl("bjs_ClosureSupportExports_static_makeIntToInt") public func _bjs_ClosureSupportExports_static_makeIntToInt(_ base: Int32) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeIntToInt(_: Int.bridgeJSLiftParameter(base)) + let base = Int.bridgeJSLiftParameter(base) + let ret = ClosureSupportExports.makeIntToInt(_: base) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10888,7 +12681,8 @@ public func _bjs_ClosureSupportExports_static_makeIntToInt(_ base: Int32) -> Int @_cdecl("bjs_ClosureSupportExports_static_makeDoubleToDouble") public func _bjs_ClosureSupportExports_static_makeDoubleToDouble(_ base: Float64) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeDoubleToDouble(_: Double.bridgeJSLiftParameter(base)) + let base = Double.bridgeJSLiftParameter(base) + let ret = ClosureSupportExports.makeDoubleToDouble(_: base) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10899,7 +12693,8 @@ public func _bjs_ClosureSupportExports_static_makeDoubleToDouble(_ base: Float64 @_cdecl("bjs_ClosureSupportExports_static_makeStringToString") public func _bjs_ClosureSupportExports_static_makeStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let ret = ClosureSupportExports.makeStringToString(_: prefix) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10910,7 +12705,8 @@ public func _bjs_ClosureSupportExports_static_makeStringToString(_ prefixBytes: @_cdecl("bjs_ClosureSupportExports_static_makeJSIntToInt") public func _bjs_ClosureSupportExports_static_makeJSIntToInt(_ base: Int32) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeJSIntToInt(_: Int.bridgeJSLiftParameter(base)) + let base = Int.bridgeJSLiftParameter(base) + let ret = ClosureSupportExports.makeJSIntToInt(_: base) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10921,7 +12717,8 @@ public func _bjs_ClosureSupportExports_static_makeJSIntToInt(_ base: Int32) -> I @_cdecl("bjs_ClosureSupportExports_static_makeJSDoubleToDouble") public func _bjs_ClosureSupportExports_static_makeJSDoubleToDouble(_ base: Float64) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeJSDoubleToDouble(_: Double.bridgeJSLiftParameter(base)) + let base = Double.bridgeJSLiftParameter(base) + let ret = ClosureSupportExports.makeJSDoubleToDouble(_: base) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10932,13 +12729,25 @@ public func _bjs_ClosureSupportExports_static_makeJSDoubleToDouble(_ base: Float @_cdecl("bjs_ClosureSupportExports_static_makeJSStringToString") public func _bjs_ClosureSupportExports_static_makeJSStringToString(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { #if arch(wasm32) - let ret = ClosureSupportExports.makeJSStringToString(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength)) + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let ret = ClosureSupportExports.makeJSStringToString(_: prefix) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } +@_expose(wasm, "bjs_ClosureSupportExports_static_makeArrayDifference") +@_cdecl("bjs_ClosureSupportExports_static_makeArrayDifference") +public func _bjs_ClosureSupportExports_static_makeArrayDifference() -> Int32 { + #if arch(wasm32) + let ret = ClosureSupportExports.makeArrayDifference() + return JSTypedClosure(ret).bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + @_expose(wasm, "bjs_ClosureSupportExports_deinit") @_cdecl("bjs_ClosureSupportExports_deinit") public func _bjs_ClosureSupportExports_deinit(_ pointer: UnsafeMutableRawPointer) -> Void { @@ -10974,7 +12783,8 @@ fileprivate func _bjs_ClosureSupportExports_wrap_extern(_ pointer: UnsafeMutable @_cdecl("bjs_Workspace_init") public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Workspace(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Workspace(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -10985,7 +12795,8 @@ public func _bjs_Workspace_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsa @_cdecl("bjs_Workspace_describe") public func _bjs_Workspace_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Workspace.bridgeJSLiftParameter(_self).describe() + let _self = Workspace.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11027,7 +12838,12 @@ fileprivate func _bjs_Workspace_wrap_extern(_ pointer: UnsafeMutableRawPointer) @_cdecl("bjs_DefaultArgumentConstructorDefaults_init") public func _bjs_DefaultArgumentConstructorDefaults_init(_ nameBytes: Int32, _ nameLength: Int32, _ count: Int32, _ enabled: Int32, _ status: Int32, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults(name: String.bridgeJSLiftParameter(nameBytes, nameLength), count: Int.bridgeJSLiftParameter(count), enabled: Bool.bridgeJSLiftParameter(enabled), status: Status.bridgeJSLiftParameter(status), tag: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) + let tag = Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength) + let status = Status.bridgeJSLiftParameter(status) + let enabled = Bool.bridgeJSLiftParameter(enabled) + let count = Int.bridgeJSLiftParameter(count) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = DefaultArgumentConstructorDefaults(name: name, count: count, enabled: enabled, status: status, tag: tag) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11038,7 +12854,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_init(_ nameBytes: Int32, _ n @_cdecl("bjs_DefaultArgumentConstructorDefaults_describe") public func _bjs_DefaultArgumentConstructorDefaults_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).describe() + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11049,7 +12866,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_describe(_ _self: UnsafeMuta @_cdecl("bjs_DefaultArgumentConstructorDefaults_name_get") public func _bjs_DefaultArgumentConstructorDefaults_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11060,7 +12878,9 @@ public func _bjs_DefaultArgumentConstructorDefaults_name_get(_ _self: UnsafeMuta @_cdecl("bjs_DefaultArgumentConstructorDefaults_name_set") public func _bjs_DefaultArgumentConstructorDefaults_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -11070,7 +12890,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_name_set(_ _self: UnsafeMuta @_cdecl("bjs_DefaultArgumentConstructorDefaults_count_get") public func _bjs_DefaultArgumentConstructorDefaults_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11081,7 +12902,9 @@ public func _bjs_DefaultArgumentConstructorDefaults_count_get(_ _self: UnsafeMut @_cdecl("bjs_DefaultArgumentConstructorDefaults_count_set") public func _bjs_DefaultArgumentConstructorDefaults_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif @@ -11091,7 +12914,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_count_set(_ _self: UnsafeMut @_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_get") public func _bjs_DefaultArgumentConstructorDefaults_enabled_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.enabled return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11102,7 +12926,9 @@ public func _bjs_DefaultArgumentConstructorDefaults_enabled_get(_ _self: UnsafeM @_cdecl("bjs_DefaultArgumentConstructorDefaults_enabled_set") public func _bjs_DefaultArgumentConstructorDefaults_enabled_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).enabled = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + _self.enabled = value #else fatalError("Only available on WebAssembly") #endif @@ -11112,7 +12938,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_enabled_set(_ _self: UnsafeM @_cdecl("bjs_DefaultArgumentConstructorDefaults_status_get") public func _bjs_DefaultArgumentConstructorDefaults_status_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.status return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11123,7 +12950,9 @@ public func _bjs_DefaultArgumentConstructorDefaults_status_get(_ _self: UnsafeMu @_cdecl("bjs_DefaultArgumentConstructorDefaults_status_set") public func _bjs_DefaultArgumentConstructorDefaults_status_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).status = Status.bridgeJSLiftParameter(value) + let value = Status.bridgeJSLiftParameter(value) + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + _self.status = value #else fatalError("Only available on WebAssembly") #endif @@ -11133,7 +12962,8 @@ public func _bjs_DefaultArgumentConstructorDefaults_status_set(_ _self: UnsafeMu @_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_get") public func _bjs_DefaultArgumentConstructorDefaults_tag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + let ret = _self.tag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11144,7 +12974,9 @@ public func _bjs_DefaultArgumentConstructorDefaults_tag_get(_ _self: UnsafeMutab @_cdecl("bjs_DefaultArgumentConstructorDefaults_tag_set") public func _bjs_DefaultArgumentConstructorDefaults_tag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self).tag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = DefaultArgumentConstructorDefaults.bridgeJSLiftParameter(_self) + _self.tag = value #else fatalError("Only available on WebAssembly") #endif @@ -11185,7 +13017,8 @@ fileprivate func _bjs_DefaultArgumentConstructorDefaults_wrap_extern(_ pointer: @_cdecl("bjs_Greeter_init") public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Greeter(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11196,7 +13029,8 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Greeter_greet") public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greet() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greet() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11207,7 +13041,9 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_changeName") public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameBytes: Int32, _ nameLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).changeName(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.changeName(name: name) #else fatalError("Only available on WebAssembly") #endif @@ -11217,7 +13053,10 @@ public func _bjs_Greeter_changeName(_ _self: UnsafeMutableRawPointer, _ nameByte @_cdecl("bjs_Greeter_greetWith") public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer, _ customGreeting: Int32) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greetWith(greeter: Greeter.bridgeJSLiftParameter(greeter), customGreeting: _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting)) + let customGreeting = _BJS_Closure_20BridgeJSRuntimeTests7GreeterC_SS.bridgeJSLift(customGreeting) + let greeter = Greeter.bridgeJSLiftParameter(greeter) + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greetWith(greeter: greeter, customGreeting: customGreeting) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11228,7 +13067,9 @@ public func _bjs_Greeter_greetWith(_ _self: UnsafeMutableRawPointer, _ greeter: @_cdecl("bjs_Greeter_makeFormatter") public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffixBytes: Int32, _ suffixLength: Int32) -> Int32 { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).makeFormatter(suffix: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let suffix = String.bridgeJSLiftParameter(suffixBytes, suffixLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.makeFormatter(suffix: suffix) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11239,7 +13080,8 @@ public func _bjs_Greeter_makeFormatter(_ _self: UnsafeMutableRawPointer, _ suffi @_cdecl("bjs_Greeter_static_makeCreator") public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ defaultNameLength: Int32) -> Int32 { #if arch(wasm32) - let ret = Greeter.makeCreator(defaultName: String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength)) + let defaultName = String.bridgeJSLiftParameter(defaultNameBytes, defaultNameLength) + let ret = Greeter.makeCreator(defaultName: defaultName) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11250,7 +13092,8 @@ public func _bjs_Greeter_static_makeCreator(_ defaultNameBytes: Int32, _ default @_cdecl("bjs_Greeter_makeCustomGreeter") public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).makeCustomGreeter() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.makeCustomGreeter() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11261,7 +13104,8 @@ public func _bjs_Greeter_makeCustomGreeter(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_Greeter_greetEnthusiastically") public func _bjs_Greeter_greetEnthusiastically(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).greetEnthusiastically() + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.greetEnthusiastically() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11283,7 +13127,8 @@ public func _bjs_Greeter_static_greetAnonymously() -> Void { @_cdecl("bjs_Greeter_name_get") public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).name + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11294,7 +13139,9 @@ public func _bjs_Greeter_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_name_set") public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Greeter.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Greeter.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -11304,7 +13151,8 @@ public func _bjs_Greeter_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes @_cdecl("bjs_Greeter_prefix_get") public func _bjs_Greeter_prefix_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).prefix + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.prefix return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11315,7 +13163,8 @@ public func _bjs_Greeter_prefix_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Greeter_nameCount_get") public func _bjs_Greeter_nameCount_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Greeter.bridgeJSLiftParameter(_self).nameCount + let _self = Greeter.bridgeJSLiftParameter(_self) + let ret = _self.nameCount return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11368,7 +13217,9 @@ fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> @_cdecl("bjs_Calculator_square") public func _bjs_Calculator_square(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.bridgeJSLiftParameter(_self).square(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Calculator.bridgeJSLiftParameter(_self) + let ret = _self.square(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11379,7 +13230,10 @@ public func _bjs_Calculator_square(_ _self: UnsafeMutableRawPointer, _ value: In @_cdecl("bjs_Calculator_add") public func _bjs_Calculator_add(_ _self: UnsafeMutableRawPointer, _ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = Calculator.bridgeJSLiftParameter(_self).add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let _self = Calculator.bridgeJSLiftParameter(_self) + let ret = _self.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11390,8 +13244,11 @@ public func _bjs_Calculator_add(_ _self: UnsafeMutableRawPointer, _ a: Int32, _ @_cdecl("bjs_Calculator_asyncMakePoint") public func _bjs_Calculator_asyncMakePoint(_ _self: UnsafeMutableRawPointer, _ x: Int32, _ y: Int32) -> Int32 { #if arch(wasm32) + let y = Int.bridgeJSLiftParameter(y) + let x = Int.bridgeJSLiftParameter(x) + let _self = Calculator.bridgeJSLiftParameter(_self) return _bjs_makePromise(resolve: Promise_resolve_11PublicPointV, reject: Promise_reject) { - return await Calculator.bridgeJSLiftParameter(_self).asyncMakePoint(x: Int.bridgeJSLiftParameter(x), y: Int.bridgeJSLiftParameter(y)) + return await _self.asyncMakePoint(x: x, y: y) } #else fatalError("Only available on WebAssembly") @@ -11537,7 +13394,9 @@ public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Utils_Converter_toString") public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.toString(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11548,7 +13407,8 @@ public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ va @_cdecl("bjs_Utils_Converter_precision_get") public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + let ret = _self.precision return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11559,7 +13419,9 @@ public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_Utils_Converter_precision_set") public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = Utils.Converter.bridgeJSLiftParameter(_self) + _self.precision = value #else fatalError("Only available on WebAssembly") #endif @@ -11611,7 +13473,9 @@ public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Networking_API_HTTPServer_call") public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method)) + let method = Networking.API.Method.bridgeJSLiftParameter(method) + let _self = Networking.API.HTTPServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -11652,7 +13516,8 @@ fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMut @_cdecl("bjs___Swift_Foundation_UUID_init") public func _bjs___Swift_Foundation_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = UUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = UUID(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11663,7 +13528,8 @@ public func _bjs___Swift_Foundation_UUID_init(_ valueBytes: Int32, _ valueLength @_cdecl("bjs___Swift_Foundation_UUID_uuidString") public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = UUID.bridgeJSLiftParameter(_self).uuidString() + let _self = UUID.bridgeJSLiftParameter(_self) + let ret = _self.uuidString() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11674,7 +13540,8 @@ public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPoi @_cdecl("bjs___Swift_Foundation_UUID_static_fromValue") public func _bjs___Swift_Foundation_UUID_static_fromValue(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = UUID.fromValue(_: String.bridgeJSLiftParameter(valueBytes, valueLength)) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let ret = UUID.fromValue(_: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11738,7 +13605,9 @@ public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRaw @_cdecl("bjs_Networking_APIV2_Internal_TestServer_call") public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void { #if arch(wasm32) - Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method)) + let method = Internal.SupportedMethod.bridgeJSLiftParameter(method) + let _self = Internal.TestServer.bridgeJSLiftParameter(_self) + _self.call(_: method) #else fatalError("Only available on WebAssembly") #endif @@ -11779,7 +13648,8 @@ fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer @_cdecl("bjs_SimplePropertyHolder_init") public func _bjs_SimplePropertyHolder_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SimplePropertyHolder(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = SimplePropertyHolder(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11790,7 +13660,8 @@ public func _bjs_SimplePropertyHolder_init(_ value: Int32) -> UnsafeMutableRawPo @_cdecl("bjs_SimplePropertyHolder_value_get") public func _bjs_SimplePropertyHolder_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SimplePropertyHolder.bridgeJSLiftParameter(_self).value + let _self = SimplePropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11801,7 +13672,9 @@ public func _bjs_SimplePropertyHolder_value_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_SimplePropertyHolder_value_set") public func _bjs_SimplePropertyHolder_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SimplePropertyHolder.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = SimplePropertyHolder.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -11842,7 +13715,14 @@ fileprivate func _bjs_SimplePropertyHolder_wrap_extern(_ pointer: UnsafeMutableR @_cdecl("bjs_PropertyHolder_init") public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ doubleValue: Float64, _ boolValue: Int32, _ stringValueBytes: Int32, _ stringValueLength: Int32, _ jsObject: Int32, _ sibling: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PropertyHolder(intValue: Int.bridgeJSLiftParameter(intValue), floatValue: Float.bridgeJSLiftParameter(floatValue), doubleValue: Double.bridgeJSLiftParameter(doubleValue), boolValue: Bool.bridgeJSLiftParameter(boolValue), stringValue: String.bridgeJSLiftParameter(stringValueBytes, stringValueLength), jsObject: JSObject.bridgeJSLiftParameter(jsObject), sibling: SimplePropertyHolder.bridgeJSLiftParameter(sibling)) + let sibling = SimplePropertyHolder.bridgeJSLiftParameter(sibling) + let jsObject = JSObject.bridgeJSLiftParameter(jsObject) + let stringValue = String.bridgeJSLiftParameter(stringValueBytes, stringValueLength) + let boolValue = Bool.bridgeJSLiftParameter(boolValue) + let doubleValue = Double.bridgeJSLiftParameter(doubleValue) + let floatValue = Float.bridgeJSLiftParameter(floatValue) + let intValue = Int.bridgeJSLiftParameter(intValue) + let ret = PropertyHolder(intValue: intValue, floatValue: floatValue, doubleValue: doubleValue, boolValue: boolValue, stringValue: stringValue, jsObject: jsObject, sibling: sibling) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11853,7 +13733,8 @@ public func _bjs_PropertyHolder_init(_ intValue: Int32, _ floatValue: Float32, _ @_cdecl("bjs_PropertyHolder_getAllValues") public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).getAllValues() + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.getAllValues() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11864,7 +13745,8 @@ public func _bjs_PropertyHolder_getAllValues(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_intValue_get") public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).intValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.intValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11875,7 +13757,9 @@ public func _bjs_PropertyHolder_intValue_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_intValue_set") public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).intValue = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.intValue = value #else fatalError("Only available on WebAssembly") #endif @@ -11885,7 +13769,8 @@ public func _bjs_PropertyHolder_intValue_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_floatValue_get") public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).floatValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.floatValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11896,7 +13781,9 @@ public func _bjs_PropertyHolder_floatValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_floatValue_set") public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).floatValue = Float.bridgeJSLiftParameter(value) + let value = Float.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.floatValue = value #else fatalError("Only available on WebAssembly") #endif @@ -11906,7 +13793,8 @@ public func _bjs_PropertyHolder_floatValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_doubleValue_get") public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).doubleValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.doubleValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11917,7 +13805,9 @@ public func _bjs_PropertyHolder_doubleValue_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_doubleValue_set") public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer, _ value: Float64) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).doubleValue = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.doubleValue = value #else fatalError("Only available on WebAssembly") #endif @@ -11927,7 +13817,8 @@ public func _bjs_PropertyHolder_doubleValue_set(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_boolValue_get") public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).boolValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.boolValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11938,7 +13829,9 @@ public func _bjs_PropertyHolder_boolValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_boolValue_set") public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).boolValue = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.boolValue = value #else fatalError("Only available on WebAssembly") #endif @@ -11948,7 +13841,8 @@ public func _bjs_PropertyHolder_boolValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_stringValue_get") public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).stringValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.stringValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11959,7 +13853,9 @@ public func _bjs_PropertyHolder_stringValue_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_stringValue_set") public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).stringValue = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.stringValue = value #else fatalError("Only available on WebAssembly") #endif @@ -11969,7 +13865,8 @@ public func _bjs_PropertyHolder_stringValue_set(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_readonlyInt_get") public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyInt + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyInt return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11980,7 +13877,8 @@ public func _bjs_PropertyHolder_readonlyInt_get(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_PropertyHolder_readonlyFloat_get") public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPointer) -> Float32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyFloat + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyFloat return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -11991,7 +13889,8 @@ public func _bjs_PropertyHolder_readonlyFloat_get(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_PropertyHolder_readonlyDouble_get") public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPointer) -> Float64 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyDouble + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyDouble return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12002,7 +13901,8 @@ public func _bjs_PropertyHolder_readonlyDouble_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_PropertyHolder_readonlyBool_get") public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyBool + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyBool return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12013,7 +13913,8 @@ public func _bjs_PropertyHolder_readonlyBool_get(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_PropertyHolder_readonlyString_get") public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).readonlyString + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.readonlyString return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12024,7 +13925,8 @@ public func _bjs_PropertyHolder_readonlyString_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_PropertyHolder_jsObject_get") public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).jsObject + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.jsObject return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12035,7 +13937,9 @@ public func _bjs_PropertyHolder_jsObject_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_PropertyHolder_jsObject_set") public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).jsObject = JSObject.bridgeJSLiftParameter(value) + let value = JSObject.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.jsObject = value #else fatalError("Only available on WebAssembly") #endif @@ -12045,7 +13949,8 @@ public func _bjs_PropertyHolder_jsObject_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_sibling_get") public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).sibling + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.sibling return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12056,7 +13961,9 @@ public func _bjs_PropertyHolder_sibling_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_PropertyHolder_sibling_set") public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).sibling = SimplePropertyHolder.bridgeJSLiftParameter(value) + let value = SimplePropertyHolder.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.sibling = value #else fatalError("Only available on WebAssembly") #endif @@ -12066,7 +13973,8 @@ public func _bjs_PropertyHolder_sibling_set(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_PropertyHolder_lazyValue_get") public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).lazyValue + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.lazyValue return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12077,7 +13985,9 @@ public func _bjs_PropertyHolder_lazyValue_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_PropertyHolder_lazyValue_set") public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).lazyValue = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.lazyValue = value #else fatalError("Only available on WebAssembly") #endif @@ -12087,7 +13997,8 @@ public func _bjs_PropertyHolder_lazyValue_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_PropertyHolder_computedReadonly_get") public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadonly + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.computedReadonly return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12098,7 +14009,8 @@ public func _bjs_PropertyHolder_computedReadonly_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_PropertyHolder_computedReadWrite_get") public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.computedReadWrite return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12109,7 +14021,9 @@ public func _bjs_PropertyHolder_computedReadWrite_get(_ _self: UnsafeMutableRawP @_cdecl("bjs_PropertyHolder_computedReadWrite_set") public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).computedReadWrite = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.computedReadWrite = value #else fatalError("Only available on WebAssembly") #endif @@ -12119,7 +14033,8 @@ public func _bjs_PropertyHolder_computedReadWrite_set(_ _self: UnsafeMutableRawP @_cdecl("bjs_PropertyHolder_observedProperty_get") public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = PropertyHolder.bridgeJSLiftParameter(_self).observedProperty + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.observedProperty return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12130,7 +14045,9 @@ public func _bjs_PropertyHolder_observedProperty_get(_ _self: UnsafeMutableRawPo @_cdecl("bjs_PropertyHolder_observedProperty_set") public func _bjs_PropertyHolder_observedProperty_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - PropertyHolder.bridgeJSLiftParameter(_self).observedProperty = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = PropertyHolder.bridgeJSLiftParameter(_self) + _self.observedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -12171,7 +14088,9 @@ fileprivate func _bjs_PropertyHolder_wrap_extern(_ pointer: UnsafeMutableRawPoin @_cdecl("bjs_MathUtils_static_add") public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.add(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.add(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12182,7 +14101,9 @@ public func _bjs_MathUtils_static_add(_ a: Int32, _ b: Int32) -> Int32 { @_cdecl("bjs_MathUtils_static_substract") public func _bjs_MathUtils_static_substract(_ a: Int32, _ b: Int32) -> Int32 { #if arch(wasm32) - let ret = MathUtils.substract(a: Int.bridgeJSLiftParameter(a), b: Int.bridgeJSLiftParameter(b)) + let b = Int.bridgeJSLiftParameter(b) + let a = Int.bridgeJSLiftParameter(a) + let ret = MathUtils.substract(a: a, b: b) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12257,7 +14178,8 @@ public func _bjs_StaticPropertyHolder_static_staticVariable_get() -> Int32 { @_cdecl("bjs_StaticPropertyHolder_static_staticVariable_set") public func _bjs_StaticPropertyHolder_static_staticVariable_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.staticVariable = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + StaticPropertyHolder.staticVariable = value #else fatalError("Only available on WebAssembly") #endif @@ -12278,7 +14200,8 @@ public func _bjs_StaticPropertyHolder_static_staticString_get() -> Void { @_cdecl("bjs_StaticPropertyHolder_static_staticString_set") public func _bjs_StaticPropertyHolder_static_staticString_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.staticString = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + StaticPropertyHolder.staticString = value #else fatalError("Only available on WebAssembly") #endif @@ -12299,7 +14222,8 @@ public func _bjs_StaticPropertyHolder_static_staticBool_get() -> Int32 { @_cdecl("bjs_StaticPropertyHolder_static_staticBool_set") public func _bjs_StaticPropertyHolder_static_staticBool_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.staticBool = Bool.bridgeJSLiftParameter(value) + let value = Bool.bridgeJSLiftParameter(value) + StaticPropertyHolder.staticBool = value #else fatalError("Only available on WebAssembly") #endif @@ -12320,7 +14244,8 @@ public func _bjs_StaticPropertyHolder_static_staticFloat_get() -> Float32 { @_cdecl("bjs_StaticPropertyHolder_static_staticFloat_set") public func _bjs_StaticPropertyHolder_static_staticFloat_set(_ value: Float32) -> Void { #if arch(wasm32) - StaticPropertyHolder.staticFloat = Float.bridgeJSLiftParameter(value) + let value = Float.bridgeJSLiftParameter(value) + StaticPropertyHolder.staticFloat = value #else fatalError("Only available on WebAssembly") #endif @@ -12341,7 +14266,8 @@ public func _bjs_StaticPropertyHolder_static_staticDouble_get() -> Float64 { @_cdecl("bjs_StaticPropertyHolder_static_staticDouble_set") public func _bjs_StaticPropertyHolder_static_staticDouble_set(_ value: Float64) -> Void { #if arch(wasm32) - StaticPropertyHolder.staticDouble = Double.bridgeJSLiftParameter(value) + let value = Double.bridgeJSLiftParameter(value) + StaticPropertyHolder.staticDouble = value #else fatalError("Only available on WebAssembly") #endif @@ -12362,7 +14288,8 @@ public func _bjs_StaticPropertyHolder_static_computedProperty_get() -> Void { @_cdecl("bjs_StaticPropertyHolder_static_computedProperty_set") public func _bjs_StaticPropertyHolder_static_computedProperty_set(_ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.computedProperty = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + StaticPropertyHolder.computedProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -12394,7 +14321,8 @@ public func _bjs_StaticPropertyHolder_static_optionalString_get() -> Void { @_cdecl("bjs_StaticPropertyHolder_static_optionalString_set") public func _bjs_StaticPropertyHolder_static_optionalString_set(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.optionalString = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + StaticPropertyHolder.optionalString = value #else fatalError("Only available on WebAssembly") #endif @@ -12415,7 +14343,8 @@ public func _bjs_StaticPropertyHolder_static_optionalInt_get() -> Void { @_cdecl("bjs_StaticPropertyHolder_static_optionalInt_set") public func _bjs_StaticPropertyHolder_static_optionalInt_set(_ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.optionalInt = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + StaticPropertyHolder.optionalInt = value #else fatalError("Only available on WebAssembly") #endif @@ -12436,7 +14365,8 @@ public func _bjs_StaticPropertyHolder_static_jsObjectProperty_get() -> Int32 { @_cdecl("bjs_StaticPropertyHolder_static_jsObjectProperty_set") public func _bjs_StaticPropertyHolder_static_jsObjectProperty_set(_ value: Int32) -> Void { #if arch(wasm32) - StaticPropertyHolder.jsObjectProperty = JSObject.bridgeJSLiftParameter(value) + let value = JSObject.bridgeJSLiftParameter(value) + StaticPropertyHolder.jsObjectProperty = value #else fatalError("Only available on WebAssembly") #endif @@ -12477,7 +14407,8 @@ fileprivate func _bjs_StaticPropertyHolder_wrap_extern(_ pointer: UnsafeMutableR @_cdecl("bjs_DataProcessorManager_init") public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = DataProcessorManager(processor: AnyDataProcessor.bridgeJSLiftParameter(processor)) + let processor = AnyDataProcessor.bridgeJSLiftParameter(processor) + let ret = DataProcessorManager(processor: processor) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12488,7 +14419,9 @@ public func _bjs_DataProcessorManager_init(_ processor: Int32) -> UnsafeMutableR @_cdecl("bjs_DataProcessorManager_incrementByAmount") public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).incrementByAmount(_: Int.bridgeJSLiftParameter(amount)) + let amount = Int.bridgeJSLiftParameter(amount) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.incrementByAmount(_: amount) #else fatalError("Only available on WebAssembly") #endif @@ -12498,7 +14431,10 @@ public func _bjs_DataProcessorManager_incrementByAmount(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_setProcessorLabel") public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRawPointer, _ prefixBytes: Int32, _ prefixLength: Int32, _ suffixBytes: Int32, _ suffixLength: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorLabel(_: String.bridgeJSLiftParameter(prefixBytes, prefixLength), _: String.bridgeJSLiftParameter(suffixBytes, suffixLength)) + let suffix = String.bridgeJSLiftParameter(suffixBytes, suffixLength) + let prefix = String.bridgeJSLiftParameter(prefixBytes, prefixLength) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorLabel(_: prefix, _: suffix) #else fatalError("Only available on WebAssembly") #endif @@ -12508,7 +14444,8 @@ public func _bjs_DataProcessorManager_setProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_isProcessorEven") public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).isProcessorEven() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.isProcessorEven() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12519,7 +14456,8 @@ public func _bjs_DataProcessorManager_isProcessorEven(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_getProcessorLabel") public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorLabel() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorLabel() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12530,7 +14468,8 @@ public func _bjs_DataProcessorManager_getProcessorLabel(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_getCurrentValue") public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getCurrentValue() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getCurrentValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12541,7 +14480,8 @@ public func _bjs_DataProcessorManager_getCurrentValue(_ _self: UnsafeMutableRawP @_cdecl("bjs_DataProcessorManager_incrementBoth") public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).incrementBoth() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.incrementBoth() #else fatalError("Only available on WebAssembly") #endif @@ -12551,7 +14491,8 @@ public func _bjs_DataProcessorManager_incrementBoth(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_getBackupValue") public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getBackupValue() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getBackupValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12562,7 +14503,8 @@ public func _bjs_DataProcessorManager_getBackupValue(_ _self: UnsafeMutableRawPo @_cdecl("bjs_DataProcessorManager_hasBackup") public func _bjs_DataProcessorManager_hasBackup(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).hasBackup() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.hasBackup() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12573,7 +14515,8 @@ public func _bjs_DataProcessorManager_hasBackup(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_DataProcessorManager_getProcessorOptionalTag") public func _bjs_DataProcessorManager_getProcessorOptionalTag(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalTag() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorOptionalTag() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12584,7 +14527,9 @@ public func _bjs_DataProcessorManager_getProcessorOptionalTag(_ _self: UnsafeMut @_cdecl("bjs_DataProcessorManager_setProcessorOptionalTag") public func _bjs_DataProcessorManager_setProcessorOptionalTag(_ _self: UnsafeMutableRawPointer, _ tagIsSome: Int32, _ tagBytes: Int32, _ tagLength: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalTag(_: Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength)) + let tag = Optional.bridgeJSLiftParameter(tagIsSome, tagBytes, tagLength) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorOptionalTag(_: tag) #else fatalError("Only available on WebAssembly") #endif @@ -12594,7 +14539,8 @@ public func _bjs_DataProcessorManager_setProcessorOptionalTag(_ _self: UnsafeMut @_cdecl("bjs_DataProcessorManager_getProcessorOptionalCount") public func _bjs_DataProcessorManager_getProcessorOptionalCount(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorOptionalCount() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorOptionalCount() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12605,7 +14551,9 @@ public func _bjs_DataProcessorManager_getProcessorOptionalCount(_ _self: UnsafeM @_cdecl("bjs_DataProcessorManager_setProcessorOptionalCount") public func _bjs_DataProcessorManager_setProcessorOptionalCount(_ _self: UnsafeMutableRawPointer, _ countIsSome: Int32, _ countValue: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorOptionalCount(_: Optional.bridgeJSLiftParameter(countIsSome, countValue)) + let count = Optional.bridgeJSLiftParameter(countIsSome, countValue) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorOptionalCount(_: count) #else fatalError("Only available on WebAssembly") #endif @@ -12615,7 +14563,8 @@ public func _bjs_DataProcessorManager_setProcessorOptionalCount(_ _self: UnsafeM @_cdecl("bjs_DataProcessorManager_getProcessorDirection") public func _bjs_DataProcessorManager_getProcessorDirection(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorDirection() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorDirection() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12626,7 +14575,9 @@ public func _bjs_DataProcessorManager_getProcessorDirection(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_setProcessorDirection") public func _bjs_DataProcessorManager_setProcessorDirection(_ _self: UnsafeMutableRawPointer, _ directionIsSome: Int32, _ directionValue: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorDirection(_: Optional.bridgeJSLiftParameter(directionIsSome, directionValue)) + let direction = Optional.bridgeJSLiftParameter(directionIsSome, directionValue) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorDirection(_: direction) #else fatalError("Only available on WebAssembly") #endif @@ -12636,7 +14587,8 @@ public func _bjs_DataProcessorManager_setProcessorDirection(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_getProcessorTheme") public func _bjs_DataProcessorManager_getProcessorTheme(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorTheme() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorTheme() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12647,7 +14599,9 @@ public func _bjs_DataProcessorManager_getProcessorTheme(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_setProcessorTheme") public func _bjs_DataProcessorManager_setProcessorTheme(_ _self: UnsafeMutableRawPointer, _ themeIsSome: Int32, _ themeBytes: Int32, _ themeLength: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorTheme(_: Optional.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength)) + let theme = Optional.bridgeJSLiftParameter(themeIsSome, themeBytes, themeLength) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorTheme(_: theme) #else fatalError("Only available on WebAssembly") #endif @@ -12657,7 +14611,8 @@ public func _bjs_DataProcessorManager_setProcessorTheme(_ _self: UnsafeMutableRa @_cdecl("bjs_DataProcessorManager_getProcessorHttpStatus") public func _bjs_DataProcessorManager_getProcessorHttpStatus(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorHttpStatus() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorHttpStatus() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12668,7 +14623,9 @@ public func _bjs_DataProcessorManager_getProcessorHttpStatus(_ _self: UnsafeMuta @_cdecl("bjs_DataProcessorManager_setProcessorHttpStatus") public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMutableRawPointer, _ statusIsSome: Int32, _ statusValue: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorHttpStatus(_: Optional.bridgeJSLiftParameter(statusIsSome, statusValue)) + let status = Optional.bridgeJSLiftParameter(statusIsSome, statusValue) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorHttpStatus(_: status) #else fatalError("Only available on WebAssembly") #endif @@ -12678,7 +14635,8 @@ public func _bjs_DataProcessorManager_setProcessorHttpStatus(_ _self: UnsafeMuta @_cdecl("bjs_DataProcessorManager_getProcessorAPIResult") public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).getProcessorAPIResult() + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.getProcessorAPIResult() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12689,7 +14647,76 @@ public func _bjs_DataProcessorManager_getProcessorAPIResult(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_setProcessorAPIResult") public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutableRawPointer, _ apiResultIsSome: Int32, _ apiResultCaseId: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).setProcessorAPIResult(_: Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId)) + let apiResult = Optional.bridgeJSLiftParameter(apiResultIsSome, apiResultCaseId) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.setProcessorAPIResult(_: apiResult) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_validateProcessorValue") +@_cdecl("bjs_DataProcessorManager_validateProcessorValue") +public func _bjs_DataProcessorManager_validateProcessorValue(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validateProcessorValue(_: value) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_loadProcessorLabel") +@_cdecl("bjs_DataProcessorManager_loadProcessorLabel") +public func _bjs_DataProcessorManager_loadProcessorLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadProcessorLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_resetProcessor") +@_cdecl("bjs_DataProcessorManager_resetProcessor") +public func _bjs_DataProcessorManager_resetProcessor(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) -> Void in + try await _self.resetProcessor() + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_DataProcessorManager_fetchProcessorCount") +@_cdecl("bjs_DataProcessorManager_fetchProcessorCount") +public func _bjs_DataProcessorManager_fetchProcessorCount(_ _self: UnsafeMutableRawPointer) -> Int32 { + #if arch(wasm32) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.fetchProcessorCount() + } #else fatalError("Only available on WebAssembly") #endif @@ -12699,7 +14726,8 @@ public func _bjs_DataProcessorManager_setProcessorAPIResult(_ _self: UnsafeMutab @_cdecl("bjs_DataProcessorManager_processor_get") public func _bjs_DataProcessorManager_processor_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).processor as! _BridgedSwiftProtocolExportable + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _bridgeJSUnwrapProtocolExportable(_self.processor, "DataProcessor") return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") @@ -12710,7 +14738,9 @@ public func _bjs_DataProcessorManager_processor_get(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_processor_set") public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).processor = AnyDataProcessor.bridgeJSLiftParameter(value) + let value = AnyDataProcessor.bridgeJSLiftParameter(value) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.processor = value #else fatalError("Only available on WebAssembly") #endif @@ -12720,9 +14750,10 @@ public func _bjs_DataProcessorManager_processor_set(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_DataProcessorManager_backupProcessor_get") public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + let ret = _self.backupProcessor if let ret { - _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_return_optional_object(1, _bridgeJSUnwrapProtocolExportable(ret, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } else { _swift_js_return_optional_object(0, 0) } @@ -12735,7 +14766,9 @@ public func _bjs_DataProcessorManager_backupProcessor_get(_ _self: UnsafeMutable @_cdecl("bjs_DataProcessorManager_backupProcessor_set") public func _bjs_DataProcessorManager_backupProcessor_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - DataProcessorManager.bridgeJSLiftParameter(_self).backupProcessor = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = DataProcessorManager.bridgeJSLiftParameter(_self) + _self.backupProcessor = value #else fatalError("Only available on WebAssembly") #endif @@ -12787,7 +14820,9 @@ public func _bjs_SwiftDataProcessor_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_SwiftDataProcessor_increment") public func _bjs_SwiftDataProcessor_increment(_ _self: UnsafeMutableRawPointer, _ amount: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).increment(by: Int.bridgeJSLiftParameter(amount)) + let amount = Int.bridgeJSLiftParameter(amount) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.increment(by: amount) #else fatalError("Only available on WebAssembly") #endif @@ -12797,7 +14832,8 @@ public func _bjs_SwiftDataProcessor_increment(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SwiftDataProcessor_getValue") public func _bjs_SwiftDataProcessor_getValue(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getValue() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.getValue() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12808,7 +14844,10 @@ public func _bjs_SwiftDataProcessor_getValue(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_SwiftDataProcessor_setLabelElements") public func _bjs_SwiftDataProcessor_setLabelElements(_ _self: UnsafeMutableRawPointer, _ labelPrefixBytes: Int32, _ labelPrefixLength: Int32, _ labelSuffixBytes: Int32, _ labelSuffixLength: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).setLabelElements(_: String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength), _: String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength)) + let labelSuffix = String.bridgeJSLiftParameter(labelSuffixBytes, labelSuffixLength) + let labelPrefix = String.bridgeJSLiftParameter(labelPrefixBytes, labelPrefixLength) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.setLabelElements(_: labelPrefix, _: labelSuffix) #else fatalError("Only available on WebAssembly") #endif @@ -12818,7 +14857,8 @@ public func _bjs_SwiftDataProcessor_setLabelElements(_ _self: UnsafeMutableRawPo @_cdecl("bjs_SwiftDataProcessor_getLabel") public func _bjs_SwiftDataProcessor_getLabel(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getLabel() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.getLabel() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12829,7 +14869,8 @@ public func _bjs_SwiftDataProcessor_getLabel(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_SwiftDataProcessor_isEven") public func _bjs_SwiftDataProcessor_isEven(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).isEven() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.isEven() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12840,7 +14881,9 @@ public func _bjs_SwiftDataProcessor_isEven(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_SwiftDataProcessor_processGreeter") public func _bjs_SwiftDataProcessor_processGreeter(_ _self: UnsafeMutableRawPointer, _ greeter: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processGreeter(_: Greeter.bridgeJSLiftParameter(greeter)) + let greeter = Greeter.bridgeJSLiftParameter(greeter) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processGreeter(_: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12851,7 +14894,8 @@ public func _bjs_SwiftDataProcessor_processGreeter(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_SwiftDataProcessor_createGreeter") public func _bjs_SwiftDataProcessor_createGreeter(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createGreeter() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.createGreeter() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12862,7 +14906,9 @@ public func _bjs_SwiftDataProcessor_createGreeter(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_SwiftDataProcessor_processOptionalGreeter") public func _bjs_SwiftDataProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ greeterIsSome: Int32, _ greeterValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue)) + let greeter = Optional.bridgeJSLiftParameter(greeterIsSome, greeterValue) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalGreeter(_: greeter) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12873,29 +14919,100 @@ public func _bjs_SwiftDataProcessor_processOptionalGreeter(_ _self: UnsafeMutabl @_cdecl("bjs_SwiftDataProcessor_createOptionalGreeter") public func _bjs_SwiftDataProcessor_createOptionalGreeter(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).createOptionalGreeter() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.createOptionalGreeter() + return ret.bridgeJSLowerReturn() + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult") +@_cdecl("bjs_SwiftDataProcessor_handleAPIResult") +public func _bjs_SwiftDataProcessor_handleAPIResult(_ _self: UnsafeMutableRawPointer, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { + #if arch(wasm32) + let result = Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.handleAPIResult(_: result) + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult") +@_cdecl("bjs_SwiftDataProcessor_getAPIResult") +public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { + #if arch(wasm32) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.getAPIResult() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftDataProcessor_handleAPIResult") -@_cdecl("bjs_SwiftDataProcessor_handleAPIResult") -public func _bjs_SwiftDataProcessor_handleAPIResult(_ _self: UnsafeMutableRawPointer, _ resultIsSome: Int32, _ resultCaseId: Int32) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_validate") +@_cdecl("bjs_SwiftDataProcessor_validate") +public func _bjs_SwiftDataProcessor_validate(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Int32 { + #if arch(wasm32) + let value = Int.bridgeJSLiftParameter(value) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + do { + let ret = try _self.validate(_: value) + return ret.bridgeJSLowerReturn() + } catch let error { + if let error = error.thrownValue.object { + withExtendedLifetime(error) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } else { + let jsError = JSError(message: error.description) + withExtendedLifetime(jsError.jsObject) { + _swift_js_throw(Int32(bitPattern: $0.id)) + } + } + return 0 + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_loadLabel") +@_cdecl("bjs_SwiftDataProcessor_loadLabel") +public func _bjs_SwiftDataProcessor_loadLabel(_ _self: UnsafeMutableRawPointer, _ keyBytes: Int32, _ keyLength: Int32) -> Int32 { + #if arch(wasm32) + let key = String.bridgeJSLiftParameter(keyBytes, keyLength) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_SS, reject: Promise_reject) { () async throws(JSException) -> String in + return try await _self.loadLabel(_: key) + } + #else + fatalError("Only available on WebAssembly") + #endif +} + +@_expose(wasm, "bjs_SwiftDataProcessor_reset") +@_cdecl("bjs_SwiftDataProcessor_reset") +public func _bjs_SwiftDataProcessor_reset(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).handleAPIResult(_: Optional.bridgeJSLiftParameter(resultIsSome, resultCaseId)) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_y, reject: Promise_reject) { () async throws(JSException) -> Void in + try await _self.reset() + } #else fatalError("Only available on WebAssembly") #endif } -@_expose(wasm, "bjs_SwiftDataProcessor_getAPIResult") -@_cdecl("bjs_SwiftDataProcessor_getAPIResult") -public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointer) -> Void { +@_expose(wasm, "bjs_SwiftDataProcessor_fetchCount") +@_cdecl("bjs_SwiftDataProcessor_fetchCount") +public func _bjs_SwiftDataProcessor_fetchCount(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).getAPIResult() - return ret.bridgeJSLowerReturn() + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + return _bjs_makePromise(resolve: Promise_resolve_Si, reject: Promise_reject) { + return await _self.fetchCount() + } #else fatalError("Only available on WebAssembly") #endif @@ -12905,7 +15022,8 @@ public func _bjs_SwiftDataProcessor_getAPIResult(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_SwiftDataProcessor_count_get") public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).count + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.count return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12916,7 +15034,9 @@ public func _bjs_SwiftDataProcessor_count_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SwiftDataProcessor_count_set") public func _bjs_SwiftDataProcessor_count_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).count = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.count = value #else fatalError("Only available on WebAssembly") #endif @@ -12926,7 +15046,8 @@ public func _bjs_SwiftDataProcessor_count_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SwiftDataProcessor_name_get") public func _bjs_SwiftDataProcessor_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).name + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12937,7 +15058,8 @@ public func _bjs_SwiftDataProcessor_name_get(_ _self: UnsafeMutableRawPointer) - @_cdecl("bjs_SwiftDataProcessor_optionalTag_get") public func _bjs_SwiftDataProcessor_optionalTag_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.optionalTag return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12948,7 +15070,9 @@ public func _bjs_SwiftDataProcessor_optionalTag_get(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_SwiftDataProcessor_optionalTag_set") public func _bjs_SwiftDataProcessor_optionalTag_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTag = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.optionalTag = value #else fatalError("Only available on WebAssembly") #endif @@ -12958,7 +15082,8 @@ public func _bjs_SwiftDataProcessor_optionalTag_set(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_SwiftDataProcessor_optionalCount_get") public func _bjs_SwiftDataProcessor_optionalCount_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.optionalCount return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12969,7 +15094,9 @@ public func _bjs_SwiftDataProcessor_optionalCount_get(_ _self: UnsafeMutableRawP @_cdecl("bjs_SwiftDataProcessor_optionalCount_set") public func _bjs_SwiftDataProcessor_optionalCount_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalCount = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.optionalCount = value #else fatalError("Only available on WebAssembly") #endif @@ -12979,7 +15106,8 @@ public func _bjs_SwiftDataProcessor_optionalCount_set(_ _self: UnsafeMutableRawP @_cdecl("bjs_SwiftDataProcessor_direction_get") public func _bjs_SwiftDataProcessor_direction_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).direction + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.direction return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -12990,7 +15118,9 @@ public func _bjs_SwiftDataProcessor_direction_get(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_SwiftDataProcessor_direction_set") public func _bjs_SwiftDataProcessor_direction_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).direction = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.direction = value #else fatalError("Only available on WebAssembly") #endif @@ -13000,7 +15130,8 @@ public func _bjs_SwiftDataProcessor_direction_set(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_SwiftDataProcessor_optionalTheme_get") public func _bjs_SwiftDataProcessor_optionalTheme_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.optionalTheme return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13011,7 +15142,9 @@ public func _bjs_SwiftDataProcessor_optionalTheme_get(_ _self: UnsafeMutableRawP @_cdecl("bjs_SwiftDataProcessor_optionalTheme_set") public func _bjs_SwiftDataProcessor_optionalTheme_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalTheme = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.optionalTheme = value #else fatalError("Only available on WebAssembly") #endif @@ -13021,7 +15154,8 @@ public func _bjs_SwiftDataProcessor_optionalTheme_set(_ _self: UnsafeMutableRawP @_cdecl("bjs_SwiftDataProcessor_httpStatus_get") public func _bjs_SwiftDataProcessor_httpStatus_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.httpStatus return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13032,7 +15166,9 @@ public func _bjs_SwiftDataProcessor_httpStatus_get(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_SwiftDataProcessor_httpStatus_set") public func _bjs_SwiftDataProcessor_httpStatus_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).httpStatus = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.httpStatus = value #else fatalError("Only available on WebAssembly") #endif @@ -13042,7 +15178,8 @@ public func _bjs_SwiftDataProcessor_httpStatus_set(_ _self: UnsafeMutableRawPoin @_cdecl("bjs_SwiftDataProcessor_apiResult_get") public func _bjs_SwiftDataProcessor_apiResult_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.apiResult return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13053,7 +15190,9 @@ public func _bjs_SwiftDataProcessor_apiResult_get(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_SwiftDataProcessor_apiResult_set") public func _bjs_SwiftDataProcessor_apiResult_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueCaseId: Int32) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).apiResult = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueCaseId) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.apiResult = value #else fatalError("Only available on WebAssembly") #endif @@ -13063,7 +15202,8 @@ public func _bjs_SwiftDataProcessor_apiResult_set(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_SwiftDataProcessor_helper_get") public func _bjs_SwiftDataProcessor_helper_get(_ _self: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).helper + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.helper return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13074,7 +15214,9 @@ public func _bjs_SwiftDataProcessor_helper_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_SwiftDataProcessor_helper_set") public func _bjs_SwiftDataProcessor_helper_set(_ _self: UnsafeMutableRawPointer, _ value: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).helper = Greeter.bridgeJSLiftParameter(value) + let value = Greeter.bridgeJSLiftParameter(value) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.helper = value #else fatalError("Only available on WebAssembly") #endif @@ -13084,7 +15226,8 @@ public func _bjs_SwiftDataProcessor_helper_set(_ _self: UnsafeMutableRawPointer, @_cdecl("bjs_SwiftDataProcessor_optionalHelper_get") public func _bjs_SwiftDataProcessor_optionalHelper_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + let ret = _self.optionalHelper return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13095,7 +15238,9 @@ public func _bjs_SwiftDataProcessor_optionalHelper_get(_ _self: UnsafeMutableRaw @_cdecl("bjs_SwiftDataProcessor_optionalHelper_set") public func _bjs_SwiftDataProcessor_optionalHelper_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - SwiftDataProcessor.bridgeJSLiftParameter(_self).optionalHelper = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = SwiftDataProcessor.bridgeJSLiftParameter(_self) + _self.optionalHelper = value #else fatalError("Only available on WebAssembly") #endif @@ -13136,7 +15281,7 @@ fileprivate func _bjs_SwiftDataProcessor_wrap_extern(_ pointer: UnsafeMutableRaw @_cdecl("bjs_ProtocolReturnTests_static_createNativeProcessor") public func _bjs_ProtocolReturnTests_static_createNativeProcessor() -> Int32 { #if arch(wasm32) - let ret = ProtocolReturnTests.createNativeProcessor() as! _BridgedSwiftProtocolExportable + let ret = _bridgeJSUnwrapProtocolExportable(ProtocolReturnTests.createNativeProcessor(), "DataProcessor") return ret.bridgeJSLowerAsProtocolReturn() #else fatalError("Only available on WebAssembly") @@ -13149,7 +15294,7 @@ public func _bjs_ProtocolReturnTests_static_createNativeProcessorOptional() -> V #if arch(wasm32) let ret = ProtocolReturnTests.createNativeProcessorOptional() if let ret { - _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_return_optional_object(1, _bridgeJSUnwrapProtocolExportable(ret, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } else { _swift_js_return_optional_object(0, 0) } @@ -13164,7 +15309,7 @@ public func _bjs_ProtocolReturnTests_static_createNativeProcessorNil() -> Void { #if arch(wasm32) let ret = ProtocolReturnTests.createNativeProcessorNil() if let ret { - _swift_js_return_optional_object(1, (ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_return_optional_object(1, _bridgeJSUnwrapProtocolExportable(ret, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } else { _swift_js_return_optional_object(0, 0) } @@ -13179,7 +15324,7 @@ public func _bjs_ProtocolReturnTests_static_createNativeProcessorArray() -> Void #if arch(wasm32) let ret = ProtocolReturnTests.createNativeProcessorArray() for __bjs_elem_ret in ret { - _swift_js_push_i32((__bjs_elem_ret as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_elem_ret, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -13194,7 +15339,7 @@ public func _bjs_ProtocolReturnTests_static_createNativeProcessorDictionary() -> let ret = ProtocolReturnTests.createNativeProcessorDictionary() for __bjs_kv_ret in ret { __bjs_kv_ret.key.bridgeJSStackPush() - _swift_js_push_i32((__bjs_kv_ret.value as! _BridgedSwiftProtocolExportable).bridgeJSLowerAsProtocolReturn()) + _swift_js_push_i32(_bridgeJSUnwrapProtocolExportable(__bjs_kv_ret.value, "DataProcessor").bridgeJSLowerAsProtocolReturn()) } _swift_js_push_i32(Int32(ret.count)) #else @@ -13237,7 +15382,8 @@ fileprivate func _bjs_ProtocolReturnTests_wrap_extern(_ pointer: UnsafeMutableRa @_cdecl("bjs_TextProcessor_init") public func _bjs_TextProcessor_init(_ transform: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = TextProcessor(transform: _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform)) + let transform = _BJS_Closure_20BridgeJSRuntimeTestsSS_SS.bridgeJSLift(transform) + let ret = TextProcessor(transform: transform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13248,7 +15394,9 @@ public func _bjs_TextProcessor_init(_ transform: Int32) -> UnsafeMutableRawPoint @_cdecl("bjs_TextProcessor_process") public func _bjs_TextProcessor_process(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).process(_: String.bridgeJSLiftParameter(textBytes, textLength)) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.process(_: text) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13259,7 +15407,10 @@ public func _bjs_TextProcessor_process(_ _self: UnsafeMutableRawPointer, _ textB @_cdecl("bjs_TextProcessor_processWithCustom") public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointer, _ textBytes: Int32, _ textLength: Int32, _ customTransform: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processWithCustom(_: String.bridgeJSLiftParameter(textBytes, textLength), customTransform: _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform)) + let customTransform = _BJS_Closure_20BridgeJSRuntimeTestsSiSSSd_SS.bridgeJSLift(customTransform) + let text = String.bridgeJSLiftParameter(textBytes, textLength) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processWithCustom(_: text, customTransform: customTransform) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13270,7 +15421,8 @@ public func _bjs_TextProcessor_processWithCustom(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_TextProcessor_getTransform") public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).getTransform() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.getTransform() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13281,7 +15433,9 @@ public func _bjs_TextProcessor_getTransform(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_TextProcessor_processOptionalString") public func _bjs_TextProcessor_processOptionalString(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalString(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSqSS_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalString(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13292,7 +15446,9 @@ public func _bjs_TextProcessor_processOptionalString(_ _self: UnsafeMutableRawPo @_cdecl("bjs_TextProcessor_processOptionalInt") public func _bjs_TextProcessor_processOptionalInt(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalInt(_: _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSqSi_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalInt(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13303,7 +15459,9 @@ public func _bjs_TextProcessor_processOptionalInt(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_TextProcessor_processOptionalGreeter") public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalGreeter(_: _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSq7GreeterC_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalGreeter(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13314,7 +15472,8 @@ public func _bjs_TextProcessor_processOptionalGreeter(_ _self: UnsafeMutableRawP @_cdecl("bjs_TextProcessor_makeOptionalStringFormatter") public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalStringFormatter() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalStringFormatter() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13325,7 +15484,8 @@ public func _bjs_TextProcessor_makeOptionalStringFormatter(_ _self: UnsafeMutabl @_cdecl("bjs_TextProcessor_makeOptionalGreeterCreator") public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalGreeterCreator() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalGreeterCreator() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13336,7 +15496,9 @@ public func _bjs_TextProcessor_makeOptionalGreeterCreator(_ _self: UnsafeMutable @_cdecl("bjs_TextProcessor_processDirection") public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processDirection(_: _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests9DirectionO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processDirection(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13347,7 +15509,9 @@ public func _bjs_TextProcessor_processDirection(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_TextProcessor_processTheme") public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processTheme(_: _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests5ThemeO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processTheme(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13358,7 +15522,9 @@ public func _bjs_TextProcessor_processTheme(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_TextProcessor_processHttpStatus") public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processHttpStatus(_: _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests10HttpStatusO_Si.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processHttpStatus(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13369,7 +15535,9 @@ public func _bjs_TextProcessor_processHttpStatus(_ _self: UnsafeMutableRawPointe @_cdecl("bjs_TextProcessor_processAPIResult") public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests9APIResultO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processAPIResult(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13380,7 +15548,8 @@ public func _bjs_TextProcessor_processAPIResult(_ _self: UnsafeMutableRawPointer @_cdecl("bjs_TextProcessor_makeDirectionChecker") public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDirectionChecker() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeDirectionChecker() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13391,7 +15560,8 @@ public func _bjs_TextProcessor_makeDirectionChecker(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_TextProcessor_makeThemeValidator") public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeThemeValidator() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeThemeValidator() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13402,7 +15572,8 @@ public func _bjs_TextProcessor_makeThemeValidator(_ _self: UnsafeMutableRawPoint @_cdecl("bjs_TextProcessor_makeStatusCodeExtractor") public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeStatusCodeExtractor() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeStatusCodeExtractor() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13413,7 +15584,8 @@ public func _bjs_TextProcessor_makeStatusCodeExtractor(_ _self: UnsafeMutableRaw @_cdecl("bjs_TextProcessor_makeAPIResultHandler") public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeAPIResultHandler() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeAPIResultHandler() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13424,7 +15596,9 @@ public func _bjs_TextProcessor_makeAPIResultHandler(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_TextProcessor_processOptionalDirection") public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDirection(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSq9DirectionO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalDirection(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13435,7 +15609,9 @@ public func _bjs_TextProcessor_processOptionalDirection(_ _self: UnsafeMutableRa @_cdecl("bjs_TextProcessor_processOptionalTheme") public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalTheme(_: _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSq5ThemeO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalTheme(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13446,7 +15622,9 @@ public func _bjs_TextProcessor_processOptionalTheme(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_TextProcessor_processOptionalAPIResult") public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalAPIResult(_: _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSq9APIResultO_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalAPIResult(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13457,7 +15635,8 @@ public func _bjs_TextProcessor_processOptionalAPIResult(_ _self: UnsafeMutableRa @_cdecl("bjs_TextProcessor_makeOptionalDirectionFormatter") public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeOptionalDirectionFormatter() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeOptionalDirectionFormatter() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13468,7 +15647,9 @@ public func _bjs_TextProcessor_makeOptionalDirectionFormatter(_ _self: UnsafeMut @_cdecl("bjs_TextProcessor_processDataProcessor") public func _bjs_TextProcessor_processDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processDataProcessor(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13479,7 +15660,8 @@ public func _bjs_TextProcessor_processDataProcessor(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_TextProcessor_makeDataProcessorFactory") public func _bjs_TextProcessor_makeDataProcessorFactory(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).makeDataProcessorFactory() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.makeDataProcessorFactory() return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13490,7 +15672,9 @@ public func _bjs_TextProcessor_makeDataProcessorFactory(_ _self: UnsafeMutableRa @_cdecl("bjs_TextProcessor_roundtripDataProcessor") public func _bjs_TextProcessor_roundtripDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Int32 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).roundtripDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests13DataProcessorP_13DataProcessorP.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.roundtripDataProcessor(_: callback) return JSTypedClosure(ret).bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13501,7 +15685,9 @@ public func _bjs_TextProcessor_roundtripDataProcessor(_ _self: UnsafeMutableRawP @_cdecl("bjs_TextProcessor_processOptionalDataProcessor") public func _bjs_TextProcessor_processOptionalDataProcessor(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalDataProcessor(_: _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSq13DataProcessorP_SS.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalDataProcessor(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13512,7 +15698,9 @@ public func _bjs_TextProcessor_processOptionalDataProcessor(_ _self: UnsafeMutab @_cdecl("bjs_TextProcessor_processVector") public func _bjs_TextProcessor_processVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Float64 { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSd_8Vector2DV.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processVector(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13523,7 +15711,9 @@ public func _bjs_TextProcessor_processVector(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_TextProcessor_processOptionalVector") public func _bjs_TextProcessor_processOptionalVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).processOptionalVector(_: _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTestsSd_Sq8Vector2DV.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.processOptionalVector(_: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13534,7 +15724,9 @@ public func _bjs_TextProcessor_processOptionalVector(_ _self: UnsafeMutableRawPo @_cdecl("bjs_TextProcessor_observeVector") public func _bjs_TextProcessor_observeVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - TextProcessor.bridgeJSLiftParameter(_self).observeVector(_: _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_y.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_y.bridgeJSLift(callback) + let _self = TextProcessor.bridgeJSLiftParameter(_self) + _self.observeVector(_: callback) #else fatalError("Only available on WebAssembly") #endif @@ -13544,7 +15736,10 @@ public func _bjs_TextProcessor_observeVector(_ _self: UnsafeMutableRawPointer, _ @_cdecl("bjs_TextProcessor_mapVector") public func _bjs_TextProcessor_mapVector(_ _self: UnsafeMutableRawPointer, _ callback: Int32) -> Void { #if arch(wasm32) - let ret = TextProcessor.bridgeJSLiftParameter(_self).mapVector(_: Vector2D.bridgeJSLiftParameter(), _: _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV.bridgeJSLift(callback)) + let callback = _BJS_Closure_20BridgeJSRuntimeTests8Vector2DV_8Vector2DV.bridgeJSLift(callback) + let vector = Vector2D.bridgeJSLiftParameter() + let _self = TextProcessor.bridgeJSLiftParameter(_self) + let ret = _self.mapVector(_: vector, _: callback) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13597,7 +15792,8 @@ public func _bjs_NestedTypeHost_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_NestedTypeHost_describe") public func _bjs_NestedTypeHost_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = NestedTypeHost.bridgeJSLiftParameter(_self).describe() + let _self = NestedTypeHost.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13639,7 +15835,8 @@ fileprivate func _bjs_NestedTypeHost_wrap_extern(_ pointer: UnsafeMutableRawPoin @_cdecl("bjs_Library_init") public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = Library(name: String.bridgeJSLiftParameter(nameBytes, nameLength)) + let name = String.bridgeJSLiftParameter(nameBytes, nameLength) + let ret = Library(name: name) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13650,7 +15847,8 @@ public func _bjs_Library_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe @_cdecl("bjs_Library_describe") public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).describe() + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.describe() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13661,7 +15859,9 @@ public func _bjs_Library_describe(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Library_rename") public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: Int32, _ titleLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).rename(_: String.bridgeJSLiftParameter(titleBytes, titleLength)) + let title = String.bridgeJSLiftParameter(titleBytes, titleLength) + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.rename(_: title) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13672,7 +15872,9 @@ public func _bjs_Library_rename(_ _self: UnsafeMutableRawPointer, _ titleBytes: @_cdecl("bjs_Library_shelf") public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: Int32, _ labelLength: Int32) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).shelf(label: String.bridgeJSLiftParameter(labelBytes, labelLength)) + let label = String.bridgeJSLiftParameter(labelBytes, labelLength) + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.shelf(label: label) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13683,7 +15885,8 @@ public func _bjs_Library_shelf(_ _self: UnsafeMutableRawPointer, _ labelBytes: I @_cdecl("bjs_Library_name_get") public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Library.bridgeJSLiftParameter(_self).name + let _self = Library.bridgeJSLiftParameter(_self) + let ret = _self.name return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13694,7 +15897,9 @@ public func _bjs_Library_name_get(_ _self: UnsafeMutableRawPointer) -> Void { @_cdecl("bjs_Library_name_set") public func _bjs_Library_name_set(_ _self: UnsafeMutableRawPointer, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - Library.bridgeJSLiftParameter(_self).name = String.bridgeJSLiftParameter(valueBytes, valueLength) + let value = String.bridgeJSLiftParameter(valueBytes, valueLength) + let _self = Library.bridgeJSLiftParameter(_self) + _self.name = value #else fatalError("Only available on WebAssembly") #endif @@ -13735,7 +15940,8 @@ fileprivate func _bjs_Library_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> @_cdecl("bjs_ImportGenericBox_init") public func _bjs_ImportGenericBox_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = ImportGenericBox(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = ImportGenericBox(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13746,7 +15952,8 @@ public func _bjs_ImportGenericBox_init(_ value: Int32) -> UnsafeMutableRawPointe @_cdecl("bjs_ImportGenericBox_get") public func _bjs_ImportGenericBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ImportGenericBox.bridgeJSLiftParameter(_self).get() + let _self = ImportGenericBox.bridgeJSLiftParameter(_self) + let ret = _self.get() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13757,7 +15964,8 @@ public func _bjs_ImportGenericBox_get(_ _self: UnsafeMutableRawPointer) -> Int32 @_cdecl("bjs_ImportGenericBox_value_get") public func _bjs_ImportGenericBox_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = ImportGenericBox.bridgeJSLiftParameter(_self).value + let _self = ImportGenericBox.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13768,7 +15976,9 @@ public func _bjs_ImportGenericBox_value_get(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_ImportGenericBox_value_set") public func _bjs_ImportGenericBox_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - ImportGenericBox.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = ImportGenericBox.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -13809,7 +16019,8 @@ fileprivate func _bjs_ImportGenericBox_wrap_extern(_ pointer: UnsafeMutableRawPo @_cdecl("bjs_JSNameRenamedClass_init") public func _bjs_JSNameRenamedClass_init(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = JSNameRenamedClass(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = JSNameRenamedClass(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13820,7 +16031,8 @@ public func _bjs_JSNameRenamedClass_init(_ value: Int32) -> UnsafeMutableRawPoin @_cdecl("bjs_JSNameRenamedClass_doubled") public func _bjs_JSNameRenamedClass_doubled(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = JSNameRenamedClass.bridgeJSLiftParameter(_self).timesTwo() + let _self = JSNameRenamedClass.bridgeJSLiftParameter(_self) + let ret = _self.timesTwo() return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13831,7 +16043,8 @@ public func _bjs_JSNameRenamedClass_doubled(_ _self: UnsafeMutableRawPointer) -> @_cdecl("bjs_JSNameRenamedClass_static_makeWithValue") public func _bjs_JSNameRenamedClass_static_makeWithValue(_ value: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = JSNameRenamedClass.create(value: Int.bridgeJSLiftParameter(value)) + let value = Int.bridgeJSLiftParameter(value) + let ret = JSNameRenamedClass.create(value: value) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13842,7 +16055,8 @@ public func _bjs_JSNameRenamedClass_static_makeWithValue(_ value: Int32) -> Unsa @_cdecl("bjs_JSNameRenamedClass_value_get") public func _bjs_JSNameRenamedClass_value_get(_ _self: UnsafeMutableRawPointer) -> Int32 { #if arch(wasm32) - let ret = JSNameRenamedClass.bridgeJSLiftParameter(_self).value + let _self = JSNameRenamedClass.bridgeJSLiftParameter(_self) + let ret = _self.value return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13853,7 +16067,9 @@ public func _bjs_JSNameRenamedClass_value_get(_ _self: UnsafeMutableRawPointer) @_cdecl("bjs_JSNameRenamedClass_value_set") public func _bjs_JSNameRenamedClass_value_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void { #if arch(wasm32) - JSNameRenamedClass.bridgeJSLiftParameter(_self).value = Int.bridgeJSLiftParameter(value) + let value = Int.bridgeJSLiftParameter(value) + let _self = JSNameRenamedClass.bridgeJSLiftParameter(_self) + _self.value = value #else fatalError("Only available on WebAssembly") #endif @@ -13894,7 +16110,9 @@ fileprivate func _bjs_JSNameRenamedClass_wrap_extern(_ pointer: UnsafeMutableRaw @_cdecl("bjs_OptionalHolder_init") public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableGreeterValue: UnsafeMutableRawPointer, _ undefinedNumberIsSome: Int32, _ undefinedNumberValue: Float64) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalHolder(nullableGreeter: Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue), undefinedNumber: JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue)) + let undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(undefinedNumberIsSome, undefinedNumberValue) + let nullableGreeter = Optional.bridgeJSLiftParameter(nullableGreeterIsSome, nullableGreeterValue) + let ret = OptionalHolder(nullableGreeter: nullableGreeter, undefinedNumber: undefinedNumber) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13905,7 +16123,8 @@ public func _bjs_OptionalHolder_init(_ nullableGreeterIsSome: Int32, _ nullableG @_cdecl("bjs_OptionalHolder_nullableGreeter_get") public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter + let _self = OptionalHolder.bridgeJSLiftParameter(_self) + let ret = _self.nullableGreeter return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13916,7 +16135,9 @@ public func _bjs_OptionalHolder_nullableGreeter_get(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_OptionalHolder_nullableGreeter_set") public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - OptionalHolder.bridgeJSLiftParameter(_self).nullableGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalHolder.bridgeJSLiftParameter(_self) + _self.nullableGreeter = value #else fatalError("Only available on WebAssembly") #endif @@ -13926,7 +16147,8 @@ public func _bjs_OptionalHolder_nullableGreeter_set(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_OptionalHolder_undefinedNumber_get") public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber + let _self = OptionalHolder.bridgeJSLiftParameter(_self) + let ret = _self.undefinedNumber return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13937,7 +16159,9 @@ public func _bjs_OptionalHolder_undefinedNumber_get(_ _self: UnsafeMutableRawPoi @_cdecl("bjs_OptionalHolder_undefinedNumber_set") public func _bjs_OptionalHolder_undefinedNumber_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Float64) -> Void { #if arch(wasm32) - OptionalHolder.bridgeJSLiftParameter(_self).undefinedNumber = JSUndefinedOr.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = JSUndefinedOr.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalHolder.bridgeJSLiftParameter(_self) + _self.undefinedNumber = value #else fatalError("Only available on WebAssembly") #endif @@ -13978,7 +16202,8 @@ fileprivate func _bjs_OptionalHolder_wrap_extern(_ pointer: UnsafeMutableRawPoin @_cdecl("bjs_OptionalPropertyHolder_init") public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ optionalNameBytes: Int32, _ optionalNameLength: Int32) -> UnsafeMutableRawPointer { #if arch(wasm32) - let ret = OptionalPropertyHolder(optionalName: Optional.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength)) + let optionalName = Optional.bridgeJSLiftParameter(optionalNameIsSome, optionalNameBytes, optionalNameLength) + let ret = OptionalPropertyHolder(optionalName: optionalName) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -13989,7 +16214,8 @@ public func _bjs_OptionalPropertyHolder_init(_ optionalNameIsSome: Int32, _ opti @_cdecl("bjs_OptionalPropertyHolder_optionalName_get") public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalName return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14000,7 +16226,9 @@ public func _bjs_OptionalPropertyHolder_optionalName_get(_ _self: UnsafeMutableR @_cdecl("bjs_OptionalPropertyHolder_optionalName_set") public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalName = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueBytes, valueLength) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalName = value #else fatalError("Only available on WebAssembly") #endif @@ -14010,7 +16238,8 @@ public func _bjs_OptionalPropertyHolder_optionalName_set(_ _self: UnsafeMutableR @_cdecl("bjs_OptionalPropertyHolder_optionalAge_get") public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalAge return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14021,7 +16250,9 @@ public func _bjs_OptionalPropertyHolder_optionalAge_get(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalPropertyHolder_optionalAge_set") public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: Int32) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalAge = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalAge = value #else fatalError("Only available on WebAssembly") #endif @@ -14031,7 +16262,8 @@ public func _bjs_OptionalPropertyHolder_optionalAge_set(_ _self: UnsafeMutableRa @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_get") public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + let ret = _self.optionalGreeter return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14042,7 +16274,9 @@ public func _bjs_OptionalPropertyHolder_optionalGreeter_get(_ _self: UnsafeMutab @_cdecl("bjs_OptionalPropertyHolder_optionalGreeter_set") public func _bjs_OptionalPropertyHolder_optionalGreeter_set(_ _self: UnsafeMutableRawPointer, _ valueIsSome: Int32, _ valueValue: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - OptionalPropertyHolder.bridgeJSLiftParameter(_self).optionalGreeter = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let value = Optional.bridgeJSLiftParameter(valueIsSome, valueValue) + let _self = OptionalPropertyHolder.bridgeJSLiftParameter(_self) + _self.optionalGreeter = value #else fatalError("Only available on WebAssembly") #endif @@ -14083,9 +16317,9 @@ fileprivate func _bjs_OptionalPropertyHolder_wrap_extern(_ pointer: UnsafeMutabl @_cdecl("bjs_Container_init") public func _bjs_Container_init() -> UnsafeMutableRawPointer { #if arch(wasm32) - let _tmp_config = Optional.bridgeJSLiftParameter() - let _tmp_location = DataPoint.bridgeJSLiftParameter() - let ret = Container(location: _tmp_location, config: _tmp_config) + let config = Optional.bridgeJSLiftParameter() + let location = DataPoint.bridgeJSLiftParameter() + let ret = Container(location: location, config: config) return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14096,7 +16330,8 @@ public func _bjs_Container_init() -> UnsafeMutableRawPointer { @_cdecl("bjs_Container_location_get") public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).location + let _self = Container.bridgeJSLiftParameter(_self) + let ret = _self.location return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14107,7 +16342,9 @@ public func _bjs_Container_location_get(_ _self: UnsafeMutableRawPointer) -> Voi @_cdecl("bjs_Container_location_set") public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).location = DataPoint.bridgeJSLiftParameter() + let value = DataPoint.bridgeJSLiftParameter() + let _self = Container.bridgeJSLiftParameter(_self) + _self.location = value #else fatalError("Only available on WebAssembly") #endif @@ -14117,7 +16354,8 @@ public func _bjs_Container_location_set(_ _self: UnsafeMutableRawPointer) -> Voi @_cdecl("bjs_Container_config_get") public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - let ret = Container.bridgeJSLiftParameter(_self).config + let _self = Container.bridgeJSLiftParameter(_self) + let ret = _self.config return ret.bridgeJSLowerReturn() #else fatalError("Only available on WebAssembly") @@ -14128,7 +16366,9 @@ public func _bjs_Container_config_get(_ _self: UnsafeMutableRawPointer) -> Void @_cdecl("bjs_Container_config_set") public func _bjs_Container_config_set(_ _self: UnsafeMutableRawPointer) -> Void { #if arch(wasm32) - Container.bridgeJSLiftParameter(_self).config = Optional.bridgeJSLiftParameter() + let value = Optional.bridgeJSLiftParameter() + let _self = Container.bridgeJSLiftParameter(_self) + _self.config = value #else fatalError("Only available on WebAssembly") #endif @@ -14243,6 +16483,10 @@ extension Point: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = Point.bridgeJSMakeTypeHandle() } +extension JSNameSnapshot: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = JSNameSnapshot.bridgeJSMakeTypeHandle() +} + extension PointerFields: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = PointerFields.bridgeJSMakeTypeHandle() } @@ -14499,6 +16743,14 @@ extension APIOptionalResult: BridgedSwiftGenericBridgeable { @_spi(BridgeJS) public static let bridgeJSTypeHandle = APIOptionalResult.bridgeJSMakeTypeHandle() } +extension AnyGenericRTPosition: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = AnyGenericRTPosition.bridgeJSMakeTypeHandle() +} + +extension AnyGenericRTNode: BridgedSwiftGenericBridgeable { + @_spi(BridgeJS) public static let bridgeJSTypeHandle = AnyGenericRTNode.bridgeJSMakeTypeHandle() +} + @JSFunction func Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) #if arch(wasm32) @@ -14524,62 +16776,62 @@ func _$Promise_reject(_ promise: JSObject, _ value: JSValue) throws(JSException) #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_SS") -fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_BridgeJSRuntimeTests_SS_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SS(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_BridgeJSRuntimeTests_SS_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_SS(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_BridgeJSRuntimeTests_SS_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_SS(_ promise: JSObject, _ value: String) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_BridgeJSRuntimeTests_SS(promiseValue, valueBytes, valueLength) + promise_resolve_BridgeJSRuntimeTests_SS(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } -@JSFunction func Promise_resolve_y(_ promise: JSObject) throws(JSException) +@JSFunction func Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_y") -fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void +@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Si") +fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void #else -fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void { +fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_y(_ promise: Int32) -> Void { - return promise_resolve_BridgeJSRuntimeTests_y_extern(promise) +@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Si(_ promise: Int32, _ value: Int32) -> Void { + return promise_resolve_BridgeJSRuntimeTests_Si_extern(promise, value) } -func _$Promise_resolve_y(_ promise: JSObject) throws(JSException) -> Void { +func _$Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) -> Void { + let valueValue = value.bridgeJSLowerParameter() let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_BridgeJSRuntimeTests_y(promiseValue) + promise_resolve_BridgeJSRuntimeTests_Si(promiseValue, valueValue) if let error = _swift_js_take_exception() { throw error } } -@JSFunction func Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) +@JSFunction func Promise_resolve_y(_ promise: JSObject) throws(JSException) #if arch(wasm32) -@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Si") -fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void +@_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_y") +fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void #else -fileprivate func promise_resolve_BridgeJSRuntimeTests_Si_extern(_ promise: Int32, _ value: Int32) -> Void { +fileprivate func promise_resolve_BridgeJSRuntimeTests_y_extern(_ promise: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Si(_ promise: Int32, _ value: Int32) -> Void { - return promise_resolve_BridgeJSRuntimeTests_Si_extern(promise, value) +@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_y(_ promise: Int32) -> Void { + return promise_resolve_BridgeJSRuntimeTests_y_extern(promise) } -func _$Promise_resolve_Si(_ promise: JSObject, _ value: Int) throws(JSException) -> Void { - let valueValue = value.bridgeJSLowerParameter() +func _$Promise_resolve_y(_ promise: JSObject) throws(JSException) -> Void { let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_BridgeJSRuntimeTests_Si(promiseValue, valueValue) + promise_resolve_BridgeJSRuntimeTests_y(promiseValue) if let error = _swift_js_take_exception() { throw error } } @@ -14692,20 +16944,20 @@ func _$Promise_resolve_8JSObjectC(_ promise: JSObject, _ value: JSObject) throws #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_5ThemeO") -fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO(_ promise: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(promise, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_5ThemeO(_ promise: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_BridgeJSRuntimeTests_5ThemeO_extern(promise, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_5ThemeO(_ promise: JSObject, _ value: Theme) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_BridgeJSRuntimeTests_5ThemeO(promiseValue, valueBytes, valueLength) + promise_resolve_BridgeJSRuntimeTests_5ThemeO(promiseValue, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } @@ -14735,20 +16987,20 @@ func _$Promise_resolve_9DirectionO(_ promise: JSObject, _ value: Direction) thro #if arch(wasm32) @_extern(wasm, module: "bjs", name: "promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO") -fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(promise, valueIsSome, valueBytes, valueLength) +@inline(never) fileprivate func promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(_ promise: Int32, _ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO_extern(promise, valueIsSome, valueWord0, valueWord1, valueWord2) } func _$Promise_resolve_Sq5ThemeO(_ promise: JSObject, _ value: Optional) throws(JSException) -> Void { - value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in let promiseValue = promise.bridgeJSLowerParameter() - promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(promiseValue, valueIsSome, valueBytes, valueLength) + promise_resolve_BridgeJSRuntimeTests_Sq5ThemeO(promiseValue, valueIsSome, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error } } @@ -15092,14 +17344,14 @@ extension Boxed: _BridgedSwiftAlias, _BridgedSwiftStackType {} #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Surface_init") -fileprivate func bjs_Surface_init_extern(_ labelBytes: Int32, _ labelLength: Int32) -> Int32 +fileprivate func bjs_Surface_init_extern(_ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Int32 #else -fileprivate func bjs_Surface_init_extern(_ labelBytes: Int32, _ labelLength: Int32) -> Int32 { +fileprivate func bjs_Surface_init_extern(_ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Surface_init(_ labelBytes: Int32, _ labelLength: Int32) -> Int32 { - return bjs_Surface_init_extern(labelBytes, labelLength) +@inline(never) fileprivate func bjs_Surface_init(_ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Int32 { + return bjs_Surface_init_extern(labelWord0, labelWord1, labelWord2) } #if arch(wasm32) @@ -15115,8 +17367,8 @@ fileprivate func bjs_Surface_label_get_extern(_ self: Int32) -> Int32 { } func _$Surface_init(_ label: String) throws(JSException) -> JSObject { - let ret0 = label.bridgeJSWithLoweredParameter { (labelBytes, labelLength) in - let ret = bjs_Surface_init(labelBytes, labelLength) + let ret0 = label.bridgeJSWithLoweredParameter { (labelWord0, labelWord1, labelWord2) in + let ret = bjs_Surface_init(labelWord0, labelWord1, labelWord2) return ret } let ret = ret0 @@ -15137,38 +17389,38 @@ func _$Surface_label_get(_ self: JSObject) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripTagged_static") -fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 +fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 #else -fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { +fileprivate func bjs_AliasImports_jsRoundTripTagged_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AliasImports_jsRoundTripTagged_static(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { - return bjs_AliasImports_jsRoundTripTagged_static_extern(valueBytes, valueLength) +@inline(never) fileprivate func bjs_AliasImports_jsRoundTripTagged_static(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { + return bjs_AliasImports_jsRoundTripTagged_static_extern(valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsRoundTripOptionalTagged_static") -fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void +fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void #else -fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { +fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static(_ valueIsSome: Int32, _ valueBytes: Int32, _ valueLength: Int32) -> Void { - return bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(valueIsSome, valueBytes, valueLength) +@inline(never) fileprivate func bjs_AliasImports_jsRoundTripOptionalTagged_static(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return bjs_AliasImports_jsRoundTripOptionalTagged_static_extern(valueIsSome, valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AliasImports_jsProduceOptionalCanvas_static") -fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void +fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Void #else -fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void { +fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static_extern(_ labelIsSome: Int32, _ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static(_ labelIsSome: Int32, _ labelBytes: Int32, _ labelLength: Int32) -> Void { - return bjs_AliasImports_jsProduceOptionalCanvas_static_extern(labelIsSome, labelBytes, labelLength) +@inline(never) fileprivate func bjs_AliasImports_jsProduceOptionalCanvas_static(_ labelIsSome: Int32, _ labelWord0: Int32, _ labelWord1: Int32, _ labelWord2: Int32) -> Void { + return bjs_AliasImports_jsProduceOptionalCanvas_static_extern(labelIsSome, labelWord0, labelWord1, labelWord2) } #if arch(wasm32) @@ -15232,8 +17484,8 @@ fileprivate func bjs_AliasImports_jsRoundTripOptionalUserId_static_extern(_ valu } func _$AliasImports_jsRoundTripTagged(_ value: Tagged) throws(JSException) -> Tagged { - let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in - let ret = bjs_AliasImports_jsRoundTripTagged_static(valueBytes, valueLength) + let ret0 = value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in + let ret = bjs_AliasImports_jsRoundTripTagged_static(valueWord0, valueWord1, valueWord2) return ret } let ret = ret0 @@ -15244,8 +17496,8 @@ func _$AliasImports_jsRoundTripTagged(_ value: Tagged) throws(JSException) -> Ta } func _$AliasImports_jsRoundTripOptionalTagged(_ value: Optional) throws(JSException) -> Optional { - value.bridgeJSWithLoweredParameter { (valueIsSome, valueBytes, valueLength) in - bjs_AliasImports_jsRoundTripOptionalTagged_static(valueIsSome, valueBytes, valueLength) + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in + bjs_AliasImports_jsRoundTripOptionalTagged_static(valueIsSome, valueWord0, valueWord1, valueWord2) } if let error = _swift_js_take_exception() { throw error @@ -15254,8 +17506,8 @@ func _$AliasImports_jsRoundTripOptionalTagged(_ value: Optional) throws( } func _$AliasImports_jsProduceOptionalCanvas(_ label: Optional) throws(JSException) -> Optional { - label.bridgeJSWithLoweredParameter { (labelIsSome, labelBytes, labelLength) in - bjs_AliasImports_jsProduceOptionalCanvas_static(labelIsSome, labelBytes, labelLength) + label.bridgeJSWithLoweredParameter { (labelIsSome, labelWord0, labelWord1, labelWord2) in + bjs_AliasImports_jsProduceOptionalCanvas_static(labelIsSome, labelWord0, labelWord1, labelWord2) } if let error = _swift_js_take_exception() { throw error @@ -15310,14 +17562,14 @@ func _$AliasImports_jsRoundTripOptionalUserId(_ value: Optional) throws( #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ArrayElementObject_init") -fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32 +fileprivate func bjs_ArrayElementObject_init_extern(_ idWord0: Int32, _ idWord1: Int32, _ idWord2: Int32) -> Int32 #else -fileprivate func bjs_ArrayElementObject_init_extern(_ idBytes: Int32, _ idLength: Int32) -> Int32 { +fileprivate func bjs_ArrayElementObject_init_extern(_ idWord0: Int32, _ idWord1: Int32, _ idWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_ArrayElementObject_init(_ idBytes: Int32, _ idLength: Int32) -> Int32 { - return bjs_ArrayElementObject_init_extern(idBytes, idLength) +@inline(never) fileprivate func bjs_ArrayElementObject_init(_ idWord0: Int32, _ idWord1: Int32, _ idWord2: Int32) -> Int32 { + return bjs_ArrayElementObject_init_extern(idWord0, idWord1, idWord2) } #if arch(wasm32) @@ -15333,8 +17585,8 @@ fileprivate func bjs_ArrayElementObject_id_get_extern(_ self: Int32) -> Int32 { } func _$ArrayElementObject_init(_ id: String) throws(JSException) -> JSObject { - let ret0 = id.bridgeJSWithLoweredParameter { (idBytes, idLength) in - let ret = bjs_ArrayElementObject_init(idBytes, idLength) + let ret0 = id.bridgeJSWithLoweredParameter { (idWord0, idWord1, idWord2) in + let ret = bjs_ArrayElementObject_init(idWord0, idWord1, idWord2) return ret } let ret = ret0 @@ -15745,26 +17997,26 @@ fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripBool_static_extern(_ res #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripString_static") -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void #else -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { - return bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(resolveRef, rejectRef, vBytes, vLength) +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { + return bjs_AsyncImportImports_jsAsyncRoundTripString_static_extern(resolveRef, rejectRef, vWord0, vWord1, vWord2) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static") -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void #else -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { - return bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(resolveRef, rejectRef, vIsSome, vBytes, vLength) +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vIsSome: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { + return bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static_extern(resolveRef, rejectRef, vIsSome, vWord0, vWord1, vWord2) } #if arch(wasm32) @@ -15817,14 +18069,14 @@ fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static_exter #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static") -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void #else -fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { +fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vBytes: Int32, _ vLength: Int32) -> Void { - return bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(resolveRef, rejectRef, vBytes, vLength) +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(_ resolveRef: Int32, _ rejectRef: Int32, _ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Void { + return bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static_extern(resolveRef, rejectRef, vWord0, vWord1, vWord2) } #if arch(wasm32) @@ -15851,11 +18103,35 @@ fileprivate func bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueE return bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static_extern(resolveRef, rejectRef, vIsSome, vCaseId) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncThrowSynchronously_static") +fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void +#else +fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncThrowSynchronously_static(_ resolveRef: Int32, _ rejectRef: Int32, _ messageWord0: Int32, _ messageWord1: Int32, _ messageWord2: Int32) -> Void { + return bjs_AsyncImportImports_jsAsyncThrowSynchronously_static_extern(resolveRef, rejectRef, messageWord0, messageWord1, messageWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_AsyncImportImports_jsAsyncReturnNonPromise_static") +fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void +#else +fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_AsyncImportImports_jsAsyncReturnNonPromise_static(_ resolveRef: Int32, _ rejectRef: Int32, _ v: Float64) -> Void { + return bjs_AsyncImportImports_jsAsyncReturnNonPromise_static_extern(resolveRef, rejectRef, v) +} + func _$AsyncImportImports_jsAsyncRoundTripVoid() async throws(JSException) -> Void { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in bjs_AsyncImportImports_jsAsyncRoundTripVoid_static(resolveRef, rejectRef) } @@ -15863,9 +18139,9 @@ func _$AsyncImportImports_jsAsyncRoundTripVoid() async throws(JSException) -> Vo func _$AsyncImportImports_jsAsyncRoundTripNumber(_ v: Double) async throws(JSException) -> Double { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Double) -> Void>($0) + JSTypedClosure<(sending Double) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripNumber_static(resolveRef, rejectRef, vValue) @@ -15875,9 +18151,9 @@ func _$AsyncImportImports_jsAsyncRoundTripNumber(_ v: Double) async throws(JSExc func _$AsyncImportImports_jsAsyncRoundTripBool(_ v: Bool) async throws(JSException) -> Bool { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Bool) -> Void>($0) + JSTypedClosure<(sending Bool) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vValue = v.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripBool_static(resolveRef, rejectRef, vValue) @@ -15887,12 +18163,12 @@ func _$AsyncImportImports_jsAsyncRoundTripBool(_ v: Bool) async throws(JSExcepti func _$AsyncImportImports_jsAsyncRoundTripString(_ v: String) async throws(JSException) -> String { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending String) -> Void>($0) + JSTypedClosure<(sending String) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - v.bridgeJSWithLoweredParameter { (vBytes, vLength) in - bjs_AsyncImportImports_jsAsyncRoundTripString_static(resolveRef, rejectRef, vBytes, vLength) + v.bridgeJSWithLoweredParameter { (vWord0, vWord1, vWord2) in + bjs_AsyncImportImports_jsAsyncRoundTripString_static(resolveRef, rejectRef, vWord0, vWord1, vWord2) } } return resolved @@ -15900,12 +18176,12 @@ func _$AsyncImportImports_jsAsyncRoundTripString(_ v: String) async throws(JSExc func _$AsyncImportImports_jsAsyncRoundTripOptionalString(_ v: Optional) async throws(JSException) -> Optional { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Optional) -> Void>($0) + JSTypedClosure<(sending Optional) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - v.bridgeJSWithLoweredParameter { (vIsSome, vBytes, vLength) in - bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(resolveRef, rejectRef, vIsSome, vBytes, vLength) + v.bridgeJSWithLoweredParameter { (vIsSome, vWord0, vWord1, vWord2) in + bjs_AsyncImportImports_jsAsyncRoundTripOptionalString_static(resolveRef, rejectRef, vIsSome, vWord0, vWord1, vWord2) } } return resolved @@ -15913,9 +18189,9 @@ func _$AsyncImportImports_jsAsyncRoundTripOptionalString(_ v: Optional) func _$AsyncImportImports_jsAsyncRoundTripOptionalNumber(_ v: Optional) async throws(JSException) -> Optional { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Optional) -> Void>($0) + JSTypedClosure<(sending Optional) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let (vIsSome, vValue) = v.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripOptionalNumber_static(resolveRef, rejectRef, vIsSome, vValue) @@ -15925,9 +18201,9 @@ func _$AsyncImportImports_jsAsyncRoundTripOptionalNumber(_ v: Optional) func _$AsyncImportImports_jsAsyncRoundTripBoolArray(_ values: [Bool]) async throws(JSException) -> [Bool] { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending [Bool]) -> Void>($0) + JSTypedClosure<(sending [Bool]) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let _ = values.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripBoolArray_static(resolveRef, rejectRef) @@ -15937,9 +18213,9 @@ func _$AsyncImportImports_jsAsyncRoundTripBoolArray(_ values: [Bool]) async thro func _$AsyncImportImports_jsAsyncRoundTripIntArray(_ values: [Double]) async throws(JSException) -> [Double] { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending [Double]) -> Void>($0) + JSTypedClosure<(sending [Double]) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let _ = values.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripIntArray_static(resolveRef, rejectRef) @@ -15949,9 +18225,9 @@ func _$AsyncImportImports_jsAsyncRoundTripIntArray(_ values: [Double]) async thr func _$AsyncImportImports_jsAsyncRoundTripStringArray(_ values: [String]) async throws(JSException) -> [String] { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending [String]) -> Void>($0) + JSTypedClosure<(sending [String]) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let _ = values.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripStringArray_static(resolveRef, rejectRef) @@ -15961,12 +18237,12 @@ func _$AsyncImportImports_jsAsyncRoundTripStringArray(_ values: [String]) async func _$AsyncImportImports_jsAsyncRoundTripFeatureFlag(_ v: FeatureFlag) async throws(JSException) -> FeatureFlag { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending FeatureFlag) -> Void>($0) + JSTypedClosure<(sending FeatureFlag) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - v.bridgeJSWithLoweredParameter { (vBytes, vLength) in - bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(resolveRef, rejectRef, vBytes, vLength) + v.bridgeJSWithLoweredParameter { (vWord0, vWord1, vWord2) in + bjs_AsyncImportImports_jsAsyncRoundTripFeatureFlag_static(resolveRef, rejectRef, vWord0, vWord1, vWord2) } } return resolved @@ -15974,9 +18250,9 @@ func _$AsyncImportImports_jsAsyncRoundTripFeatureFlag(_ v: FeatureFlag) async th func _$AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum(_ v: AsyncImportedPayloadResult) async throws(JSException) -> AsyncImportedPayloadResult { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending AsyncImportedPayloadResult) -> Void>($0) + JSTypedClosure<(sending AsyncImportedPayloadResult) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let vCaseId = v.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum_static(resolveRef, rejectRef, vCaseId) @@ -15986,9 +18262,9 @@ func _$AsyncImportImports_jsAsyncRoundTripAssociatedValueEnum(_ v: AsyncImported func _$AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum(_ v: Optional) async throws(JSException) -> Optional { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending Optional) -> Void>($0) + JSTypedClosure<(sending Optional) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in let (vIsSome, vCaseId) = v.bridgeJSLowerParameter() bjs_AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum_static(resolveRef, rejectRef, vIsSome, vCaseId) @@ -15996,6 +18272,31 @@ func _$AsyncImportImports_jsAsyncRoundTripOptionalAssociatedValueEnum(_ v: Optio return resolved } +func _$AsyncImportImports_jsAsyncThrowSynchronously(_ message: String) async throws(JSException) -> Double { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { + JSTypedClosure<(sending Double) -> Void>.sending($0) + }, makeRejectClosure: { + JSTypedClosure<(sending JSValue) -> Void>.sending($0) + }) { resolveRef, rejectRef in + message.bridgeJSWithLoweredParameter { (messageWord0, messageWord1, messageWord2) in + bjs_AsyncImportImports_jsAsyncThrowSynchronously_static(resolveRef, rejectRef, messageWord0, messageWord1, messageWord2) + } + } + return resolved +} + +func _$AsyncImportImports_jsAsyncReturnNonPromise(_ v: Double) async throws(JSException) -> Double { + let resolved = try await _bjs_awaitPromise(makeResolveClosure: { + JSTypedClosure<(sending Double) -> Void>.sending($0) + }, makeRejectClosure: { + JSTypedClosure<(sending JSValue) -> Void>.sending($0) + }) { resolveRef, rejectRef in + let vValue = v.bridgeJSLowerParameter() + bjs_AsyncImportImports_jsAsyncReturnNonPromise_static(resolveRef, rejectRef, vValue) + } + return resolved +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureAsyncImports_runJsClosureAsyncTests_static") fileprivate func bjs_ClosureAsyncImports_runJsClosureAsyncTests_static_extern(_ resolveRef: Int32, _ rejectRef: Int32) -> Void @@ -16012,7 +18313,7 @@ func _$ClosureAsyncImports_runJsClosureAsyncTests() async throws(JSException) -> try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in bjs_ClosureAsyncImports_runJsClosureAsyncTests_static(resolveRef, rejectRef) } @@ -16068,14 +18369,14 @@ fileprivate func bjs_ClosureSupportImports_jsApplyDouble_static_extern(_ value: #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyString_static") -fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32, _ transform: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsApplyString_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32, _ transform: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ valueBytes: Int32, _ valueLength: Int32, _ transform: Int32) -> Int32 { - return bjs_ClosureSupportImports_jsApplyString_static_extern(valueBytes, valueLength, transform) +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyString_static(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32, _ transform: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsApplyString_static_extern(valueWord0, valueWord1, valueWord2, transform) } #if arch(wasm32) @@ -16090,6 +18391,66 @@ fileprivate func bjs_ClosureSupportImports_jsApplyJSObject_static_extern(_ value return bjs_ClosureSupportImports_jsApplyJSObject_static_extern(value, transform) } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyArrayInt_static") +fileprivate func bjs_ClosureSupportImports_jsApplyArrayInt_static_extern(_ transform: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyArrayInt_static_extern(_ transform: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyArrayInt_static(_ transform: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyArrayInt_static_extern(transform) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyArrayDouble_static") +fileprivate func bjs_ClosureSupportImports_jsApplyArrayDouble_static_extern(_ transform: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyArrayDouble_static_extern(_ transform: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyArrayDouble_static(_ transform: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyArrayDouble_static_extern(transform) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyArrayString_static") +fileprivate func bjs_ClosureSupportImports_jsApplyArrayString_static_extern(_ transform: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyArrayString_static_extern(_ transform: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyArrayString_static(_ transform: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyArrayString_static_extern(transform) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyArrayJSValue_static") +fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSValue_static_extern(_ transform: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSValue_static_extern(_ transform: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSValue_static(_ transform: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyArrayJSValue_static_extern(transform) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsApplyArrayJSObject_static") +fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSObject_static_extern(_ transform: Int32) -> Void +#else +fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSObject_static_extern(_ transform: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_ClosureSupportImports_jsApplyArrayJSObject_static(_ transform: Int32) -> Void { + return bjs_ClosureSupportImports_jsApplyArrayJSObject_static_extern(transform) +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeIntToInt_static") fileprivate func bjs_ClosureSupportImports_jsMakeIntToInt_static_extern(_ base: Int32) -> Int32 @@ -16116,14 +18477,14 @@ fileprivate func bjs_ClosureSupportImports_jsMakeDoubleToDouble_static_extern(_ #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ClosureSupportImports_jsMakeStringToString_static") -fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 #else -fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { +fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static_extern(_ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { - return bjs_ClosureSupportImports_jsMakeStringToString_static_extern(prefixBytes, prefixLength) +@inline(never) fileprivate func bjs_ClosureSupportImports_jsMakeStringToString_static(_ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 { + return bjs_ClosureSupportImports_jsMakeStringToString_static_extern(prefixWord0, prefixWord1, prefixWord2) } #if arch(wasm32) @@ -16272,9 +18633,9 @@ func _$ClosureSupportImports_jsApplyDouble(_ value: Double, _ transform: JSTyped } func _$ClosureSupportImports_jsApplyString(_ value: String, _ transform: JSTypedClosure<(String) -> String>) throws(JSException) -> String { - let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in + let ret0 = value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in let transformFuncRef = transform.bridgeJSLowerParameter() - let ret = bjs_ClosureSupportImports_jsApplyString_static(valueBytes, valueLength, transformFuncRef) + let ret = bjs_ClosureSupportImports_jsApplyString_static(valueWord0, valueWord1, valueWord2, transformFuncRef) return ret } let ret = ret0 @@ -16294,6 +18655,56 @@ func _$ClosureSupportImports_jsApplyJSObject(_ value: JSObject, _ transform: JST return JSObject.bridgeJSLiftReturn(ret) } +func _$ClosureSupportImports_jsApplyArrayInt(_ value: [Int], _ transform: JSTypedClosure<([Int]) -> [Int]>) throws(JSException) -> [Int] { + let transformFuncRef = transform.bridgeJSLowerParameter() + let _ = value.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyArrayInt_static(transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return [Int].bridgeJSLiftReturn() +} + +func _$ClosureSupportImports_jsApplyArrayDouble(_ value: [Double], _ transform: JSTypedClosure<([Double]) -> [Double]>) throws(JSException) -> [Double] { + let transformFuncRef = transform.bridgeJSLowerParameter() + let _ = value.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyArrayDouble_static(transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return [Double].bridgeJSLiftReturn() +} + +func _$ClosureSupportImports_jsApplyArrayString(_ value: [String], _ transform: JSTypedClosure<([String]) -> [String]>) throws(JSException) -> [String] { + let transformFuncRef = transform.bridgeJSLowerParameter() + let _ = value.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyArrayString_static(transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +func _$ClosureSupportImports_jsApplyArrayJSValue(_ value: [JSValue], _ transform: JSTypedClosure<([JSValue]) -> [JSValue]>) throws(JSException) -> [JSValue] { + let transformFuncRef = transform.bridgeJSLowerParameter() + let _ = value.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyArrayJSValue_static(transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return [JSValue].bridgeJSLiftReturn() +} + +func _$ClosureSupportImports_jsApplyArrayJSObject(_ value: [JSObject], _ transform: JSTypedClosure<([JSObject]) -> [JSObject]>) throws(JSException) -> [JSObject] { + let transformFuncRef = transform.bridgeJSLowerParameter() + let _ = value.bridgeJSLowerParameter() + bjs_ClosureSupportImports_jsApplyArrayJSObject_static(transformFuncRef) + if let error = _swift_js_take_exception() { + throw error + } + return [JSObject].bridgeJSLiftReturn() +} + func _$ClosureSupportImports_jsMakeIntToInt(_ base: Int) throws(JSException) -> (Int) -> Int { let baseValue = base.bridgeJSLowerParameter() let ret = bjs_ClosureSupportImports_jsMakeIntToInt_static(baseValue) @@ -16313,8 +18724,8 @@ func _$ClosureSupportImports_jsMakeDoubleToDouble(_ base: Double) throws(JSExcep } func _$ClosureSupportImports_jsMakeStringToString(_ prefix: String) throws(JSException) -> (String) -> String { - let ret0 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in - let ret = bjs_ClosureSupportImports_jsMakeStringToString_static(prefixBytes, prefixLength) + let ret0 = prefix.bridgeJSWithLoweredParameter { (prefixWord0, prefixWord1, prefixWord2) in + let ret = bjs_ClosureSupportImports_jsMakeStringToString_static(prefixWord0, prefixWord1, prefixWord2) return ret } let ret = ret0 @@ -16566,14 +18977,14 @@ func _$DictionarySupportImports_jsRoundTripDictionaryDoubleArray(_ values: [Stri #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Foo_init") -fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 +fileprivate func bjs_Foo_init_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 #else -fileprivate func bjs_Foo_init_extern(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { +fileprivate func bjs_Foo_init_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Foo_init(_ valueBytes: Int32, _ valueLength: Int32) -> Int32 { - return bjs_Foo_init_extern(valueBytes, valueLength) +@inline(never) fileprivate func bjs_Foo_init(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { + return bjs_Foo_init_extern(valueWord0, valueWord1, valueWord2) } #if arch(wasm32) @@ -16589,8 +19000,8 @@ fileprivate func bjs_Foo_value_get_extern(_ self: Int32) -> Int32 { } func _$Foo_init(_ value: String) throws(JSException) -> JSObject { - let ret0 = value.bridgeJSWithLoweredParameter { (valueBytes, valueLength) in - let ret = bjs_Foo_init(valueBytes, valueLength) + let ret0 = value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in + let ret = bjs_Foo_init(valueWord0, valueWord1, valueWord2) return ret } let ret = ret0 @@ -16692,19 +19103,19 @@ func _$jsRoundTripBool(_ v: Bool) throws(JSException) -> Bool { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripString") -fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32 +fileprivate func bjs_jsRoundTripString_extern(_ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Int32 #else -fileprivate func bjs_jsRoundTripString_extern(_ vBytes: Int32, _ vLength: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripString_extern(_ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_jsRoundTripString(_ vBytes: Int32, _ vLength: Int32) -> Int32 { - return bjs_jsRoundTripString_extern(vBytes, vLength) +@inline(never) fileprivate func bjs_jsRoundTripString(_ vWord0: Int32, _ vWord1: Int32, _ vWord2: Int32) -> Int32 { + return bjs_jsRoundTripString_extern(vWord0, vWord1, vWord2) } func _$jsRoundTripString(_ v: String) throws(JSException) -> String { - let ret0 = v.bridgeJSWithLoweredParameter { (vBytes, vLength) in - let ret = bjs_jsRoundTripString(vBytes, vLength) + let ret0 = v.bridgeJSWithLoweredParameter { (vWord0, vWord1, vWord2) in + let ret = bjs_jsRoundTripString(vWord0, vWord1, vWord2) return ret } let ret = ret0 @@ -16820,19 +19231,19 @@ func _$jsThrowOrString(_ shouldThrow: Bool) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsRoundTripFeatureFlag") -fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 +fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Int32 #else -fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 { +fileprivate func bjs_jsRoundTripFeatureFlag_extern(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_jsRoundTripFeatureFlag(_ flagBytes: Int32, _ flagLength: Int32) -> Int32 { - return bjs_jsRoundTripFeatureFlag_extern(flagBytes, flagLength) +@inline(never) fileprivate func bjs_jsRoundTripFeatureFlag(_ flagWord0: Int32, _ flagWord1: Int32, _ flagWord2: Int32) -> Int32 { + return bjs_jsRoundTripFeatureFlag_extern(flagWord0, flagWord1, flagWord2) } func _$jsRoundTripFeatureFlag(_ flag: FeatureFlag) throws(JSException) -> FeatureFlag { - let ret0 = flag.bridgeJSWithLoweredParameter { (flagBytes, flagLength) in - let ret = bjs_jsRoundTripFeatureFlag(flagBytes, flagLength) + let ret0 = flag.bridgeJSWithLoweredParameter { (flagWord0, flagWord1, flagWord2) in + let ret = bjs_jsRoundTripFeatureFlag(flagWord0, flagWord1, flagWord2) return ret } let ret = ret0 @@ -16858,7 +19269,7 @@ func _$runAsyncWorks() async throws(JSException) -> Void { try await _bjs_awaitPromise(makeResolveClosure: { JSTypedClosure<() -> Void>($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in bjs_runAsyncWorks(resolveRef, rejectRef) } @@ -16866,24 +19277,24 @@ func _$runAsyncWorks() async throws(JSException) -> Void { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_fetchWeatherData") -fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void +fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityWord0: Int32, _ cityWord1: Int32, _ cityWord2: Int32) -> Void #else -fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void { +fileprivate func bjs_fetchWeatherData_extern(_ resolveRef: Int32, _ rejectRef: Int32, _ cityWord0: Int32, _ cityWord1: Int32, _ cityWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_fetchWeatherData(_ resolveRef: Int32, _ rejectRef: Int32, _ cityBytes: Int32, _ cityLength: Int32) -> Void { - return bjs_fetchWeatherData_extern(resolveRef, rejectRef, cityBytes, cityLength) +@inline(never) fileprivate func bjs_fetchWeatherData(_ resolveRef: Int32, _ rejectRef: Int32, _ cityWord0: Int32, _ cityWord1: Int32, _ cityWord2: Int32) -> Void { + return bjs_fetchWeatherData_extern(resolveRef, rejectRef, cityWord0, cityWord1, cityWord2) } func _$fetchWeatherData(_ city: String) async throws(JSException) -> WeatherData { let resolved = try await _bjs_awaitPromise(makeResolveClosure: { - JSTypedClosure<(sending WeatherData) -> Void>($0) + JSTypedClosure<(sending WeatherData) -> Void>.sending($0) }, makeRejectClosure: { - JSTypedClosure<(sending JSValue) -> Void>($0) + JSTypedClosure<(sending JSValue) -> Void>.sending($0) }) { resolveRef, rejectRef in - city.bridgeJSWithLoweredParameter { (cityBytes, cityLength) in - bjs_fetchWeatherData(resolveRef, rejectRef, cityBytes, cityLength) + city.bridgeJSWithLoweredParameter { (cityWord0, cityWord1, cityWord2) in + bjs_fetchWeatherData(resolveRef, rejectRef, cityWord0, cityWord1, cityWord2) } } return resolved @@ -16911,19 +19322,19 @@ func _$_jsWeirdFunction() throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_parseInt") -fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 +fileprivate func bjs_parseInt_extern(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 #else -fileprivate func bjs_parseInt_extern(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 { +fileprivate func bjs_parseInt_extern(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_parseInt(_ stringBytes: Int32, _ stringLength: Int32) -> Float64 { - return bjs_parseInt_extern(stringBytes, stringLength) +@inline(never) fileprivate func bjs_parseInt(_ stringWord0: Int32, _ stringWord1: Int32, _ stringWord2: Int32) -> Float64 { + return bjs_parseInt_extern(stringWord0, stringWord1, stringWord2) } func _$parseInt(_ string: String) throws(JSException) -> Double { - let ret0 = string.bridgeJSWithLoweredParameter { (stringBytes, stringLength) in - let ret = bjs_parseInt(stringBytes, stringLength) + let ret0 = string.bridgeJSWithLoweredParameter { (stringWord0, stringWord1, stringWord2) in + let ret = bjs_parseInt(stringWord0, stringWord1, stringWord2) return ret } let ret = ret0 @@ -16935,14 +19346,14 @@ func _$parseInt(_ string: String) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init") -fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 +fileprivate func bjs_JsGreeter_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 #else -fileprivate func bjs_JsGreeter_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { +fileprivate func bjs_JsGreeter_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_JsGreeter_init(_ nameBytes: Int32, _ nameLength: Int32, _ prefixBytes: Int32, _ prefixLength: Int32) -> Int32 { - return bjs_JsGreeter_init_extern(nameBytes, nameLength, prefixBytes, prefixLength) +@inline(never) fileprivate func bjs_JsGreeter_init(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ prefixWord0: Int32, _ prefixWord1: Int32, _ prefixWord2: Int32) -> Int32 { + return bjs_JsGreeter_init_extern(nameWord0, nameWord1, nameWord2, prefixWord0, prefixWord1, prefixWord2) } #if arch(wasm32) @@ -16971,14 +19382,14 @@ fileprivate func bjs_JsGreeter_prefix_get_extern(_ self: Int32) -> Int32 { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set") -fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_JsGreeter_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_JsGreeter_name_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_JsGreeter_name_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_JsGreeter_name_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -16995,20 +19406,20 @@ fileprivate func bjs_JsGreeter_greet_extern(_ self: Int32) -> Int32 { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName") -fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void +fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void #else -fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +fileprivate func bjs_JsGreeter_changeName_extern(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { - return bjs_JsGreeter_changeName_extern(self, nameBytes, nameLength) +@inline(never) fileprivate func bjs_JsGreeter_changeName(_ self: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { + return bjs_JsGreeter_changeName_extern(self, nameWord0, nameWord1, nameWord2) } func _$JsGreeter_init(_ name: String, _ prefix: String) throws(JSException) -> JSObject { - let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in - let ret1 = prefix.bridgeJSWithLoweredParameter { (prefixBytes, prefixLength) in - let ret = bjs_JsGreeter_init(nameBytes, nameLength, prefixBytes, prefixLength) + let ret0 = name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in + let ret1 = prefix.bridgeJSWithLoweredParameter { (prefixWord0, prefixWord1, prefixWord2) in + let ret = bjs_JsGreeter_init(nameWord0, nameWord1, nameWord2, prefixWord0, prefixWord1, prefixWord2) return ret } return ret1 @@ -17039,9 +19450,9 @@ func _$JsGreeter_prefix_get(_ self: JSObject) throws(JSException) -> String { } func _$JsGreeter_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_JsGreeter_name_set(selfValue, newValueBytes, newValueLength) + bjs_JsGreeter_name_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -17058,9 +19469,9 @@ func _$JsGreeter_greet(_ self: JSObject) throws(JSException) -> String { } func _$JsGreeter_changeName(_ self: JSObject, _ name: String) throws(JSException) -> Void { - name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in + name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_JsGreeter_changeName(selfValue, nameBytes, nameLength) + bjs_JsGreeter_changeName(selfValue, nameWord0, nameWord1, nameWord2) } if let error = _swift_js_take_exception() { throw error @@ -17117,14 +19528,14 @@ fileprivate func bjs_WeatherData_temperature_set_extern(_ self: Int32, _ newValu #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_WeatherData_description_set") -fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_WeatherData_description_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_WeatherData_description_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_WeatherData_description_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_WeatherData_description_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_WeatherData_description_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -17176,9 +19587,9 @@ func _$WeatherData_temperature_set(_ self: JSObject, _ newValue: Double) throws( } func _$WeatherData_description_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_WeatherData_description_set(selfValue, newValueBytes, newValueLength) + bjs_WeatherData_description_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -17360,14 +19771,14 @@ func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_init") -fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 +fileprivate func bjs_Animal_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ age: Float64, _ isCat: Int32) -> Int32 #else -fileprivate func bjs_Animal_init_extern(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { +fileprivate func bjs_Animal_init_extern(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Animal_init(_ nameBytes: Int32, _ nameLength: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { - return bjs_Animal_init_extern(nameBytes, nameLength, age, isCat) +@inline(never) fileprivate func bjs_Animal_init(_ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32, _ age: Float64, _ isCat: Int32) -> Int32 { + return bjs_Animal_init_extern(nameWord0, nameWord1, nameWord2, age, isCat) } #if arch(wasm32) @@ -17408,14 +19819,14 @@ fileprivate func bjs_Animal_isCat_get_extern(_ self: Int32) -> Int32 { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Animal_name_set") -fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void +fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void #else -fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { +fileprivate func bjs_Animal_name_set_extern(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValueBytes: Int32, _ newValueLength: Int32) -> Void { - return bjs_Animal_name_set_extern(self, newValueBytes, newValueLength) +@inline(never) fileprivate func bjs_Animal_name_set(_ self: Int32, _ newValueWord0: Int32, _ newValueWord1: Int32, _ newValueWord2: Int32) -> Void { + return bjs_Animal_name_set_extern(self, newValueWord0, newValueWord1, newValueWord2) } #if arch(wasm32) @@ -17467,10 +19878,10 @@ fileprivate func bjs_Animal_getIsCat_extern(_ self: Int32) -> Int32 { } func _$Animal_init(_ name: String, _ age: Double, _ isCat: Bool) throws(JSException) -> JSObject { - let ret0 = name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in + let ret0 = name.bridgeJSWithLoweredParameter { (nameWord0, nameWord1, nameWord2) in let isCatValue = isCat.bridgeJSLowerParameter() let ageValue = age.bridgeJSLowerParameter() - let ret = bjs_Animal_init(nameBytes, nameLength, ageValue, isCatValue) + let ret = bjs_Animal_init(nameWord0, nameWord1, nameWord2, ageValue, isCatValue) return ret } let ret = ret0 @@ -17508,9 +19919,9 @@ func _$Animal_isCat_get(_ self: JSObject) throws(JSException) -> Bool { } func _$Animal_name_set(_ self: JSObject, _ newValue: String) throws(JSException) -> Void { - newValue.bridgeJSWithLoweredParameter { (newValueBytes, newValueLength) in + newValue.bridgeJSWithLoweredParameter { (newValueWord0, newValueWord1, newValueWord2) in let selfValue = self.bridgeJSLowerParameter() - bjs_Animal_name_set(selfValue, newValueBytes, newValueLength) + bjs_Animal_name_set(selfValue, newValueWord0, newValueWord1, newValueWord2) } if let error = _swift_js_take_exception() { throw error @@ -17684,21 +20095,47 @@ func _$jsJoinEnumThenArray(_ a: ImportedPayloadSignal, _ b: [Int]) throws(JSExce #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsJoinStringThenStackParams") -fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 +fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 #else -fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sBytes: Int32, _ sLength: Int32) -> Int32 { +fileprivate func bjs_jsJoinStringThenStackParams_extern(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_jsJoinStringThenStackParams(_ sBytes: Int32, _ sLength: Int32) -> Int32 { - return bjs_jsJoinStringThenStackParams_extern(sBytes, sLength) +@inline(never) fileprivate func bjs_jsJoinStringThenStackParams(_ sWord0: Int32, _ sWord1: Int32, _ sWord2: Int32) -> Int32 { + return bjs_jsJoinStringThenStackParams_extern(sWord0, sWord1, sWord2) } func _$jsJoinStringThenStackParams(_ s: String, _ a: Optional<[Int]>, _ b: [Int]) throws(JSException) -> String { - let ret0 = s.bridgeJSWithLoweredParameter { (sBytes, sLength) in + let ret0 = s.bridgeJSWithLoweredParameter { (sWord0, sWord1, sWord2) in let _ = b.bridgeJSLowerParameter() let _ = a.bridgeJSLowerParameter() - let ret = bjs_jsJoinStringThenStackParams(sBytes, sLength) + let ret = bjs_jsJoinStringThenStackParams(sWord0, sWord1, sWord2) + return ret + } + let ret = ret0 + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsDescribeReservedWordParameters") +fileprivate func bjs_jsDescribeReservedWordParameters_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 +#else +fileprivate func bjs_jsDescribeReservedWordParameters_extern(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_jsDescribeReservedWordParameters(_ `in`: Int32, _ forWord0: Int32, _ forWord1: Int32, _ forWord2: Int32, _ `default`: Int32) -> Int32 { + return bjs_jsDescribeReservedWordParameters_extern(`in`, forWord0, forWord1, forWord2, `default`) +} + +func _$jsDescribeReservedWordParameters(_ `in`: Int, _ `for`: String, _ `default`: Bool) throws(JSException) -> String { + let ret0 = `for`.bridgeJSWithLoweredParameter { (forWord0, forWord1, forWord2) in + let defaultValue = `default`.bridgeJSLowerParameter() + let inValue = `in`.bridgeJSLowerParameter() + let ret = bjs_jsDescribeReservedWordParameters(inValue, forWord0, forWord1, forWord2, defaultValue) return ret } let ret = ret0 @@ -17752,19 +20189,19 @@ func _$jsGenericRoundTripClass(_ value: T) thr #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericParsePoint") -fileprivate func bjs_jsGenericParsePoint_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void +fileprivate func bjs_jsGenericParsePoint_extern(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void #else -fileprivate func bjs_jsGenericParsePoint_extern(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void { +fileprivate func bjs_jsGenericParsePoint_extern(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_jsGenericParsePoint(_ jsonBytes: Int32, _ jsonLength: Int32, _ _generic0TypeId: Int32) -> Void { - return bjs_jsGenericParsePoint_extern(jsonBytes, jsonLength, _generic0TypeId) +@inline(never) fileprivate func bjs_jsGenericParsePoint(_ jsonWord0: Int32, _ jsonWord1: Int32, _ jsonWord2: Int32, _ _generic0TypeId: Int32) -> Void { + return bjs_jsGenericParsePoint_extern(jsonWord0, jsonWord1, jsonWord2, _generic0TypeId) } func _$jsGenericParsePoint(_ json: String) throws(JSException) -> T { - json.bridgeJSWithLoweredParameter { (jsonBytes, jsonLength) in - bjs_jsGenericParsePoint(jsonBytes, jsonLength, T.bridgeJSTypeID) + json.bridgeJSWithLoweredParameter { (jsonWord0, jsonWord1, jsonWord2) in + bjs_jsGenericParsePoint(jsonWord0, jsonWord1, jsonWord2, T.bridgeJSTypeID) } if let error = _swift_js_take_exception() { throw error @@ -17943,6 +20380,47 @@ func _$jsGenericThrowOrRoundTrip(_ shouldThrow return T.bridgeJSStackPop() } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericNodeRoundTrip") +fileprivate func bjs_jsGenericNodeRoundTrip_extern(_ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_jsGenericNodeRoundTrip_extern(_ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_jsGenericNodeRoundTrip(_ _generic0TypeId: Int32) -> Void { + return bjs_jsGenericNodeRoundTrip_extern(_generic0TypeId) +} + +func _$jsGenericNodeRoundTrip(_ value: T) throws(JSException) -> T { + value.bridgeJSStackPush() + bjs_jsGenericNodeRoundTrip(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_jsGenericMakeNode") +fileprivate func bjs_jsGenericMakeNode_extern(_ _generic0TypeId: Int32) -> Void +#else +fileprivate func bjs_jsGenericMakeNode_extern(_ _generic0TypeId: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_jsGenericMakeNode(_ _generic0TypeId: Int32) -> Void { + return bjs_jsGenericMakeNode_extern(_generic0TypeId) +} + +func _$jsGenericMakeNode() throws(JSException) -> T { + bjs_jsGenericMakeNode(T.bridgeJSTypeID) + if let error = _swift_js_take_exception() { + throw error + } + return T.bridgeJSStackPop() +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_ImportGenericConsumer_init") fileprivate func bjs_ImportGenericConsumer_init_extern() -> Int32 @@ -18537,19 +21015,19 @@ func _$defaultExport_get() throws(JSException) -> JSObject { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_nodeBasename") -fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 +fileprivate func bjs_nodeBasename_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 #else -fileprivate func bjs_nodeBasename_extern(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { +fileprivate func bjs_nodeBasename_extern(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_nodeBasename(_ pathBytes: Int32, _ pathLength: Int32) -> Int32 { - return bjs_nodeBasename_extern(pathBytes, pathLength) +@inline(never) fileprivate func bjs_nodeBasename(_ pathWord0: Int32, _ pathWord1: Int32, _ pathWord2: Int32) -> Int32 { + return bjs_nodeBasename_extern(pathWord0, pathWord1, pathWord2) } func _$nodeBasename(_ path: String) throws(JSException) -> String { - let ret0 = path.bridgeJSWithLoweredParameter { (pathBytes, pathLength) in - let ret = bjs_nodeBasename(pathBytes, pathLength) + let ret0 = path.bridgeJSWithLoweredParameter { (pathWord0, pathWord1, pathWord2) in + let ret = bjs_nodeBasename(pathWord0, pathWord1, pathWord2) return ret } let ret = ret0 @@ -18561,20 +21039,20 @@ func _$nodeBasename(_ path: String) throws(JSException) -> String { #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_nodeJoin") -fileprivate func bjs_nodeJoin_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 +fileprivate func bjs_nodeJoin_extern(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 #else -fileprivate func bjs_nodeJoin_extern(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 { +fileprivate func bjs_nodeJoin_extern(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_nodeJoin(_ lhsBytes: Int32, _ lhsLength: Int32, _ rhsBytes: Int32, _ rhsLength: Int32) -> Int32 { - return bjs_nodeJoin_extern(lhsBytes, lhsLength, rhsBytes, rhsLength) +@inline(never) fileprivate func bjs_nodeJoin(_ lhsWord0: Int32, _ lhsWord1: Int32, _ lhsWord2: Int32, _ rhsWord0: Int32, _ rhsWord1: Int32, _ rhsWord2: Int32) -> Int32 { + return bjs_nodeJoin_extern(lhsWord0, lhsWord1, lhsWord2, rhsWord0, rhsWord1, rhsWord2) } func _$nodeJoin(_ lhs: String, _ rhs: String) throws(JSException) -> String { - let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsBytes, lhsLength) in - let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsBytes, rhsLength) in - let ret = bjs_nodeJoin(lhsBytes, lhsLength, rhsBytes, rhsLength) + let ret0 = lhs.bridgeJSWithLoweredParameter { (lhsWord0, lhsWord1, lhsWord2) in + let ret1 = rhs.bridgeJSWithLoweredParameter { (rhsWord0, rhsWord1, rhsWord2) in + let ret = bjs_nodeJoin(lhsWord0, lhsWord1, lhsWord2, rhsWord0, rhsWord1, rhsWord2) return ret } return ret1 @@ -19118,26 +21596,26 @@ fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalNumberUndefined_s #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { - return bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(nameIsSome, nameBytes, nameLength) +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static_extern(nameIsSome, nameWord0, nameWord1, nameWord2) } #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static") -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void #else -fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { +fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { fatalError("Only available on WebAssembly") } #endif -@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameBytes: Int32, _ nameLength: Int32) -> Void { - return bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(nameIsSome, nameBytes, nameLength) +@inline(never) fileprivate func bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(_ nameIsSome: Int32, _ nameWord0: Int32, _ nameWord1: Int32, _ nameWord2: Int32) -> Void { + return bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static_extern(nameIsSome, nameWord0, nameWord1, nameWord2) } #if arch(wasm32) @@ -19231,8 +21709,8 @@ func _$OptionalSupportImports_jsRoundTripOptionalNumberUndefined(_ value: JSUnde } func _$OptionalSupportImports_jsRoundTripOptionalStringNull(_ name: Optional) throws(JSException) -> Optional { - name.bridgeJSWithLoweredParameter { (nameIsSome, nameBytes, nameLength) in - bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(nameIsSome, nameBytes, nameLength) + name.bridgeJSWithLoweredParameter { (nameIsSome, nameWord0, nameWord1, nameWord2) in + bjs_OptionalSupportImports_jsRoundTripOptionalStringNull_static(nameIsSome, nameWord0, nameWord1, nameWord2) } if let error = _swift_js_take_exception() { throw error @@ -19241,8 +21719,8 @@ func _$OptionalSupportImports_jsRoundTripOptionalStringNull(_ name: Optional) throws(JSException) -> JSUndefinedOr { - name.bridgeJSWithLoweredParameter { (nameIsSome, nameBytes, nameLength) in - bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(nameIsSome, nameBytes, nameLength) + name.bridgeJSWithLoweredParameter { (nameIsSome, nameWord0, nameWord1, nameWord2) in + bjs_OptionalSupportImports_jsRoundTripOptionalStringUndefined_static(nameIsSome, nameWord0, nameWord1, nameWord2) } if let error = _swift_js_take_exception() { throw error @@ -19302,6 +21780,92 @@ func _$OptionalSupportImports_runJsOptionalSupportTests() throws(JSException) -> } } +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StringABIImports_jsEcho_static") +fileprivate func bjs_StringABIImports_jsEcho_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 +#else +fileprivate func bjs_StringABIImports_jsEcho_static_extern(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_StringABIImports_jsEcho_static(_ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Int32 { + return bjs_StringABIImports_jsEcho_static_extern(valueWord0, valueWord1, valueWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StringABIImports_jsEchoOptional_static") +fileprivate func bjs_StringABIImports_jsEchoOptional_static_extern(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void +#else +fileprivate func bjs_StringABIImports_jsEchoOptional_static_extern(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_StringABIImports_jsEchoOptional_static(_ valueIsSome: Int32, _ valueWord0: Int32, _ valueWord1: Int32, _ valueWord2: Int32) -> Void { + return bjs_StringABIImports_jsEchoOptional_static_extern(valueIsSome, valueWord0, valueWord1, valueWord2) +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StringABIImports_jsEchoArray_static") +fileprivate func bjs_StringABIImports_jsEchoArray_static_extern() -> Void +#else +fileprivate func bjs_StringABIImports_jsEchoArray_static_extern() -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_StringABIImports_jsEchoArray_static() -> Void { + return bjs_StringABIImports_jsEchoArray_static_extern() +} + +#if arch(wasm32) +@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_StringABIImports_runJsStringABITests_static") +fileprivate func bjs_StringABIImports_runJsStringABITests_static_extern() -> Void +#else +fileprivate func bjs_StringABIImports_runJsStringABITests_static_extern() -> Void { + fatalError("Only available on WebAssembly") +} +#endif +@inline(never) fileprivate func bjs_StringABIImports_runJsStringABITests_static() -> Void { + return bjs_StringABIImports_runJsStringABITests_static_extern() +} + +func _$StringABIImports_jsEcho(_ value: String) throws(JSException) -> String { + let ret0 = value.bridgeJSWithLoweredParameter { (valueWord0, valueWord1, valueWord2) in + let ret = bjs_StringABIImports_jsEcho_static(valueWord0, valueWord1, valueWord2) + return ret + } + let ret = ret0 + if let error = _swift_js_take_exception() { + throw error + } + return String.bridgeJSLiftReturn(ret) +} + +func _$StringABIImports_jsEchoOptional(_ value: Optional) throws(JSException) -> Optional { + value.bridgeJSWithLoweredParameter { (valueIsSome, valueWord0, valueWord1, valueWord2) in + bjs_StringABIImports_jsEchoOptional_static(valueIsSome, valueWord0, valueWord1, valueWord2) + } + if let error = _swift_js_take_exception() { + throw error + } + return Optional.bridgeJSLiftReturnFromSideChannel() +} + +func _$StringABIImports_jsEchoArray(_ value: [String]) throws(JSException) -> [String] { + let _ = value.bridgeJSLowerParameter() + bjs_StringABIImports_jsEchoArray_static() + if let error = _swift_js_take_exception() { + throw error + } + return [String].bridgeJSLiftReturn() +} + +func _$StringABIImports_runJsStringABITests() throws(JSException) -> Void { + bjs_StringABIImports_runJsStringABITests_static() + if let error = _swift_js_take_exception() { + throw error + } +} + #if arch(wasm32) @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_gc") fileprivate func bjs_gc_extern() -> Void @@ -19440,6 +22004,7 @@ public func _bjs_BridgeJSRuntimeTests_register_type_handles() { GenericRTPoint.bridgeJSTypeID, GenericRTNamespace.Metadata.bridgeJSTypeID, Point.bridgeJSTypeID, + JSNameSnapshot.bridgeJSTypeID, PointerFields.bridgeJSTypeID, DataPoint.bridgeJSTypeID, PublicPoint.bridgeJSTypeID, @@ -19504,6 +22069,8 @@ public func _bjs_BridgeJSRuntimeTests_register_type_handles() { GenericRTOutcome.bridgeJSTypeID, OptionalAllTypesResult.bridgeJSTypeID, APIOptionalResult.bridgeJSTypeID, + AnyGenericRTPosition.bridgeJSTypeID, + AnyGenericRTNode.bridgeJSTypeID, ] typeIds.withUnsafeBufferPointer { buffer in _bjs_BridgeJSRuntimeTests_register_type_handles_extern(buffer.baseAddress, Int32(buffer.count)) diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json index c1a3e26cc..fb4d924e7 100644 --- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json +++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json @@ -823,6 +823,69 @@ "_0" : "ClosureSupportExports" } } + }, + { + "abiName" : "bjs_ClosureSupportExports_static_makeArrayDifference", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "makeArrayDifference", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSaSiSaSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + }, + { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : false + } + }, + "staticContext" : { + "className" : { + "_0" : "ClosureSupportExports" + } + } } ], "name" : "ClosureSupportExports", @@ -2956,6 +3019,99 @@ } } + }, + { + "abiName" : "bjs_DataProcessorManager_validateProcessorValue", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validateProcessorValue", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_loadProcessorLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadProcessorLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_resetProcessor", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "resetProcessor", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessorManager_fetchProcessorCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchProcessorCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "DataProcessorManager", @@ -3262,6 +3418,99 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_SwiftDataProcessor_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_SwiftDataProcessor_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "SwiftDataProcessor", @@ -5080,6 +5329,7 @@ } ] }, + "jsName" : "NamedCounter", "methods" : [ { "abiName" : "bjs_JSNameRenamedClass_doubled", @@ -11230,36 +11480,103 @@ ], "emitStyle" : "const", - "name" : "JSTypedArrayExports", + "jsName" : "CounterTools", + "name" : "JSNameTools", + "namespace" : [ + "Renaming" + ], "staticMethods" : [ { - "abiName" : "bjs_JSTypedArrayExports_static_roundTripUint8Array", + "abiName" : "bjs_Renaming_JSNameTools_static_apply", "effects" : { "isAsync" : false, "isStatic" : true, "isThrows" : false }, - "name" : "roundTripUint8Array", + "name" : "apply", "namespace" : [ - "JSTypedArrayExports" + "Renaming", + "JSNameTools" ], "parameters" : [ { "label" : "_", - "name" : "v", + "name" : "transformer", "type" : { - "jsObject" : { - "_0" : "JSUint8Array" + "swiftProtocol" : { + "_0" : "JSNameTransformer" + } + } + }, + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } } } } ], "returnType" : { - "jsObject" : { - "_0" : "JSUint8Array" - } - }, - "staticContext" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "JSNameTools" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "JSNameTools", + "tsFullPath" : "Renaming.CounterTools" + }, + { + "cases" : [ + + ], + "emitStyle" : "const", + "name" : "JSTypedArrayExports", + "staticMethods" : [ + { + "abiName" : "bjs_JSTypedArrayExports_static_roundTripUint8Array", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "roundTripUint8Array", + "namespace" : [ + "JSTypedArrayExports" + ], + "parameters" : [ + { + "label" : "_", + "name" : "v", + "type" : { + "jsObject" : { + "_0" : "JSUint8Array" + } + } + } + ], + "returnType" : { + "jsObject" : { + "_0" : "JSUint8Array" + } + }, + "staticContext" : { "namespaceEnum" : { "_0" : "JSTypedArrayExports" } @@ -12954,161 +13271,602 @@ ], "swiftCallName" : "APIOptionalResult", "tsFullPath" : "APIOptionalResult" - } - ], - "exposeToGlobal" : false, - "functions" : [ + }, { - "abiName" : "bjs_makeTag", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "makeTag", - "parameters" : [ - { - "label" : "_", - "name" : "name", - "type" : { - "string" : { + "cases" : [ - } - } - } ], - "returnType" : { - "alias" : { - "name" : "Tag", - "underlying" : { - "swiftHeapObject" : { - "_0" : "TagReference" - } - } - } - } - }, - { - "abiName" : "bjs_roundTripPolygon", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "roundTripPolygon", - "parameters" : [ + "emitStyle" : "const", + "name" : "StringABIExports", + "staticMethods" : [ { - "label" : "_", - "name" : "polygon", - "type" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" + "abiName" : "bjs_StringABIExports_static_echo", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "echo", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "string" : { + } } } - } - } - ], - "returnType" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" + ], + "returnType" : { + "string" : { + } - } - } - } - }, - { - "abiName" : "bjs_appendVertex", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "appendVertex", - "parameters" : [ - { - "label" : "_", - "name" : "polygon", - "type" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" - } - } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" } } }, { - "label" : "_", - "name" : "value", - "type" : { - "double" : { + "abiName" : "bjs_StringABIExports_static_echoOptional", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "echoOptional", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "string" : { + } + }, + "_1" : "null" + } + } } - } - } - ], - "returnType" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" - } - } - } - } - }, - { - "abiName" : "bjs_optionalRoundTripPolygon", - "effects" : { - "isAsync" : false, - "isStatic" : false, - "isThrows" : false - }, - "name" : "optionalRoundTripPolygon", - "parameters" : [ - { - "label" : "_", - "name" : "polygon", - "type" : { + ], + "returnType" : { "nullable" : { "_0" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" - } - } + "string" : { + } }, "_1" : "null" } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } } - } - ], - "returnType" : { - "nullable" : { - "_0" : { - "alias" : { - "name" : "Polygon", - "underlying" : { - "swiftHeapObject" : { - "_0" : "PolygonReference" + }, + { + "abiName" : "bjs_StringABIExports_static_echoArray", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "echoArray", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } } } } - }, - "_1" : "null" + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallEmpty", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallEmpty", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallASCII", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallASCII", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallEight", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallEight", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallNine", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallNine", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallTen", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallTen", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_smallUTF8", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "smallUTF8", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_largeImmortal", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "largeImmortal", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_largeImmortalAgain", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "largeImmortalAgain", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_largeDynamic", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "largeDynamic", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_immortalSubstring", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "immortalSubstring", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_optionalNone", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "optionalNone", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + }, + { + "abiName" : "bjs_StringABIExports_static_optionalSome", + "effects" : { + "isAsync" : false, + "isStatic" : true, + "isThrows" : false + }, + "name" : "optionalSome", + "namespace" : [ + "StringABIExports" + ], + "parameters" : [ + + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + }, + "staticContext" : { + "namespaceEnum" : { + "_0" : "StringABIExports" + } + } + } + ], + "staticProperties" : [ + + ], + "swiftCallName" : "StringABIExports", + "tsFullPath" : "StringABIExports" + } + ], + "exposeToGlobal" : false, + "functions" : [ + { + "abiName" : "bjs_makeTag", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeTag", + "parameters" : [ + { + "label" : "_", + "name" : "name", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "alias" : { + "name" : "Tag", + "underlying" : { + "swiftHeapObject" : { + "_0" : "TagReference" + } + } + } + } + }, + { + "abiName" : "bjs_roundTripPolygon", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripPolygon", + "parameters" : [ + { + "label" : "_", + "name" : "polygon", + "type" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + } + } + ], + "returnType" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + } + }, + { + "abiName" : "bjs_appendVertex", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "appendVertex", + "parameters" : [ + { + "label" : "_", + "name" : "polygon", + "type" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + } + }, + { + "label" : "_", + "name" : "value", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + } + }, + { + "abiName" : "bjs_optionalRoundTripPolygon", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "optionalRoundTripPolygon", + "parameters" : [ + { + "label" : "_", + "name" : "polygon", + "type" : { + "nullable" : { + "_0" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "alias" : { + "name" : "Polygon", + "underlying" : { + "swiftHeapObject" : { + "_0" : "PolygonReference" + } + } + } + }, + "_1" : "null" } } }, @@ -14153,6 +14911,109 @@ } } }, + { + "abiName" : "bjs_makeAsyncArraySum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeAsyncArraySum", + "parameters" : [ + + ], + "returnType" : { + "closure" : { + "_0" : { + "isAsync" : true, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsYaSaSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : true + } + } + }, + { + "abiName" : "bjs_awaitArraySum", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "awaitArraySum", + "parameters" : [ + { + "label" : "_", + "name" : "sum", + "type" : { + "closure" : { + "_0" : { + "isAsync" : true, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsYaSaSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, { "abiName" : "bjs_makeThrowingParser", "effects" : { @@ -14221,11 +15082,103 @@ "returnType" : { "bool" : { - } - }, - "sendingParameters" : false - }, - "useJSTypedClosure" : false + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : false + } + } + } + ], + "returnType" : { + "bool" : { + + } + } + }, + { + "abiName" : "bjs_roundTripVoid", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripVoid", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_roundTripFloat", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripFloat", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "float" : { + + } + } + } + ], + "returnType" : { + "float" : { + + } + } + }, + { + "abiName" : "bjs_roundTripDouble", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripDouble", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "double" : { + + } + } + } + ], + "returnType" : { + "double" : { + + } + } + }, + { + "abiName" : "bjs_roundTripBool", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "roundTripBool", + "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "bool" : { + } } } @@ -14237,112 +15190,186 @@ } }, { - "abiName" : "bjs_roundTripVoid", + "abiName" : "bjs_roundTripString", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripVoid", + "name" : "roundTripString", "parameters" : [ + { + "label" : "v", + "name" : "v", + "type" : { + "string" : { + } + } + } ], "returnType" : { - "void" : { + "string" : { } } }, { - "abiName" : "bjs_roundTripFloat", + "abiName" : "bjs_describeReservedWordParameters", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripFloat", + "name" : "describeReservedWordParameters", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "extension", + "name" : "extension", "type" : { - "float" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "break", + "name" : "break", + "type" : { + "double" : { + + } + } + }, + { + "label" : "function", + "name" : "function", + "type" : { + "bool" : { + + } + } + }, + { + "label" : "in", + "name" : "in", + "type" : { + "string" : { } } } ], "returnType" : { - "float" : { + "string" : { } } }, { - "abiName" : "bjs_roundTripDouble", + "abiName" : "bjs_describeBacktickedParameter", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripDouble", + "name" : "describeBacktickedParameter", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "_", + "name" : "in", "type" : { - "double" : { + "string" : { } } } ], "returnType" : { - "double" : { + "string" : { } } }, { - "abiName" : "bjs_roundTripBool", + "abiName" : "bjs_describeCollidingParameters", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripBool", + "name" : "describeCollidingParameters", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "in", + "name" : "in", "type" : { - "bool" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "_in", + "name" : "_in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "instance", + "name" : "instance", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "swift", + "name" : "swift", + "type" : { + "string" : { } } } ], "returnType" : { - "bool" : { + "string" : { } } }, { - "abiName" : "bjs_roundTripString", + "abiName" : "bjs_describeWithReservedWordDescriber", "effects" : { "isAsync" : false, "isStatic" : false, "isThrows" : false }, - "name" : "roundTripString", + "name" : "describeWithReservedWordDescriber", "parameters" : [ { - "label" : "v", - "name" : "v", + "label" : "_", + "name" : "describer", "type" : { - "string" : { - + "swiftProtocol" : { + "_0" : "ReservedWordDescriber" } } } @@ -14659,6 +15686,40 @@ } } }, + { + "abiName" : "bjs_makeJSValueString", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeJSValueString", + "parameters" : [ + + ], + "returnType" : { + "jsValue" : { + + } + } + }, + { + "abiName" : "bjs_makeJSValueObject", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "makeJSValueObject", + "parameters" : [ + + ], + "returnType" : { + "jsValue" : { + + } + } + }, { "abiName" : "bjs_roundTripOptionalJSValue", "effects" : { @@ -14944,6 +16005,40 @@ } } }, + { + "abiName" : "bjs_throwsBeforeJSObjectResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsBeforeJSObjectResult", + "parameters" : [ + + ], + "returnType" : { + "jsObject" : { + + } + } + }, + { + "abiName" : "bjs_throwsBeforeProtocolResult", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "throwsBeforeProtocolResult", + "parameters" : [ + + ], + "returnType" : { + "swiftProtocol" : { + "_0" : "DataProcessor" + } + } + }, { "abiName" : "bjs_zeroArgAsyncThrows", "effects" : { @@ -17437,6 +18532,56 @@ } } }, + { + "abiName" : "bjs_describeRefinedEntity", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describeRefinedEntity", + "parameters" : [ + { + "label" : "_", + "name" : "entity", + "type" : { + "swiftProtocol" : { + "_0" : "RefineEntity" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_describeTaggedEntity", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describeTaggedEntity", + "parameters" : [ + { + "label" : "_", + "name" : "entity", + "type" : { + "swiftProtocol" : { + "_0" : "RefineTagged" + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, { "abiName" : "bjs_renamedEcho", "effects" : { @@ -18331,21 +19476,66 @@ { "methods" : [ - ], - "name" : "ArrayElementProtocol", - "properties" : [ - { - "isReadonly" : false, - "name" : "value", - "type" : { - "integer" : { - "_0" : { - "isSigned" : true, - "width" : "word" + ], + "name" : "ArrayElementProtocol", + "properties" : [ + { + "isReadonly" : false, + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + { + "methods" : [ + { + "abiName" : "bjs_ReservedWordDescriber_describe", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "describe", + "parameters" : [ + { + "label" : "in", + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "label" : "for", + "name" : "for", + "type" : { + "string" : { + + } } } + ], + "returnType" : { + "string" : { + + } } } + ], + "name" : "ReservedWordDescriber", + "properties" : [ + ] }, { @@ -18611,6 +19801,99 @@ "_1" : "null" } } + }, + { + "abiName" : "bjs_DataProcessor_validate", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "validate", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_DataProcessor_loadLabel", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "loadLabel", + "parameters" : [ + { + "label" : "_", + "name" : "key", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_reset", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "reset", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + }, + { + "abiName" : "bjs_DataProcessor_fetchCount", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "fetchCount", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } ], "name" : "DataProcessor", @@ -18695,59 +19978,274 @@ "_1" : "null" } } - }, + }, + { + "isReadonly" : false, + "name" : "httpStatus", + "type" : { + "nullable" : { + "_0" : { + "rawValueEnum" : { + "_0" : "HttpStatus", + "_1" : "Int" + } + }, + "_1" : "null" + } + } + }, + { + "isReadonly" : false, + "name" : "apiResult", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "APIResult" + } + }, + "_1" : "null" + } + } + }, + { + "isReadonly" : false, + "name" : "helper", + "type" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + } + }, + { + "isReadonly" : false, + "name" : "optionalHelper", + "type" : { + "nullable" : { + "_0" : { + "swiftHeapObject" : { + "_0" : "Greeter" + } + }, + "_1" : "null" + } + } + } + ] + }, + { + "isGenericBridgeable" : true, + "methods" : [ + { + "abiName" : "bjs_GenericRTPosition_sum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sum", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "name" : "GenericRTPosition", + "properties" : [ + { + "isReadonly" : true, + "name" : "x", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + { + "inheritedJSProtocols" : [ + "GenericRTPosition" + ], + "isGenericBridgeable" : true, + "methods" : [ + + ], + "name" : "GenericRTNode", + "properties" : [ + { + "isReadonly" : true, + "name" : "y", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + { + "methods" : [ + + ], + "name" : "RefineIdentified", + "properties" : [ + { + "isReadonly" : true, + "name" : "id", + "type" : { + "string" : { + + } + } + }, + { + "isReadonly" : false, + "name" : "score", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + { + "methods" : [ + { + "abiName" : "bjs_RefineNamed_label", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "label", + "parameters" : [ + + ], + "returnType" : { + "string" : { + + } + } + } + ], + "name" : "RefineNamed", + "properties" : [ { - "isReadonly" : false, - "name" : "httpStatus", + "isReadonly" : true, + "name" : "name", "type" : { - "nullable" : { - "_0" : { - "rawValueEnum" : { - "_0" : "HttpStatus", - "_1" : "Int" - } - }, - "_1" : "null" + "string" : { + } } - }, + } + ] + }, + { + "inheritedJSProtocols" : [ + "RefineIdentified", + "RefineNamed" + ], + "methods" : [ { - "isReadonly" : false, - "name" : "apiResult", - "type" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "APIResult" - } - }, - "_1" : "null" + "abiName" : "bjs_RefineEntity_label", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "label", + "parameters" : [ + + ], + "returnType" : { + "string" : { + } } - }, + } + ], + "name" : "RefineEntity", + "properties" : [ { - "isReadonly" : false, - "name" : "helper", + "isReadonly" : true, + "name" : "id", "type" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "string" : { + } } - }, + } + ] + }, + { + "inheritedJSProtocols" : [ + "RefineEntity" + ], + "methods" : [ + + ], + "name" : "RefineTagged", + "properties" : [ + + ] + }, + { + "jsName" : "CounterTransform", + "methods" : [ { - "isReadonly" : false, - "name" : "optionalHelper", - "type" : { - "nullable" : { - "_0" : { - "swiftHeapObject" : { - "_0" : "Greeter" + "abiName" : "bjs_JSNameTransformer_apply", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "apply", + "parameters" : [ + { + "label" : "_", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } } - }, - "_1" : "null" + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } } } } + ], + "name" : "JSNameTransformer", + "properties" : [ + ] } ], @@ -19103,7 +20601,26 @@ }, { "methods" : [ + { + "abiName" : "bjs_GenericRTPoint_sum", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sum", + "parameters" : [ + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } ], "name" : "GenericRTPoint", "properties" : [ @@ -19212,6 +20729,51 @@ ], "swiftCallName" : "Point" }, + { + "constructor" : { + "abiName" : "bjs_JSNameSnapshot_init", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : false + }, + "parameters" : [ + { + "label" : "value", + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ] + }, + "jsName" : "CounterSnapshot", + "methods" : [ + + ], + "name" : "JSNameSnapshot", + "properties" : [ + { + "isReadonly" : true, + "isStatic" : false, + "name" : "value", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + ], + "swiftCallName" : "JSNameSnapshot" + }, { "constructor" : { "abiName" : "bjs_PointerFields_init", @@ -20750,8 +22312,102 @@ "string" : { } - }, - "_1" : "null" + }, + "_1" : "null" + } + } + }, + { + "abiName" : "bjs_ArrayMembers_ownSumAsync", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "ownSumAsync", + "parameters" : [ + + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_ArrayMembers_sumAsync", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : false + }, + "name" : "sumAsync", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "abiName" : "bjs_ArrayMembers_requireValues", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "requireValues", + "parameters" : [ + { + "label" : "_", + "name" : "values", + "type" : { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } } } @@ -21948,30 +23604,268 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripOptionalString", + "name" : "jsAsyncRoundTripOptionalString", + "parameters" : [ + { + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripOptionalNumber", + "parameters" : [ + { + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "double" : { + + } + }, + "_1" : "null" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripBoolArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "bool" : { + + } + } + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripIntArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "double" : { + + } + } + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripStringArray", + "parameters" : [ + { + "name" : "values", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripFeatureFlag", + "parameters" : [ + { + "name" : "v", + "type" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + } + ], + "returnType" : { + "rawValueEnum" : { + "_0" : "FeatureFlag", + "_1" : "String" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripAssociatedValueEnum", + "parameters" : [ + { + "name" : "v", + "type" : { + "associatedValueEnum" : { + "_0" : "AsyncImportedPayloadResult" + } + } + } + ], + "returnType" : { + "associatedValueEnum" : { + "_0" : "AsyncImportedPayloadResult" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncRoundTripOptionalAssociatedValueEnum", + "parameters" : [ + { + "name" : "v", + "type" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AsyncImportedPayloadResult" + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "associatedValueEnum" : { + "_0" : "AsyncImportedPayloadResult" + } + }, + "_1" : "null" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : true, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsAsyncThrowSynchronously", "parameters" : [ { - "name" : "v", + "name" : "message", "type" : { - "nullable" : { - "_0" : { - "string" : { + "string" : { - } - }, - "_1" : "null" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "string" : { + "double" : { - } - }, - "_1" : "null" } } }, @@ -21982,33 +23876,45 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripOptionalNumber", + "name" : "jsAsyncReturnNonPromise", "parameters" : [ { "name" : "v", "type" : { - "nullable" : { - "_0" : { - "double" : { + "double" : { - } - }, - "_1" : "null" } } } ], "returnType" : { - "nullable" : { - "_0" : { - "double" : { + "double" : { - } - }, - "_1" : "null" } } - }, + } + ] + } + ] + }, + { + "functions" : [ + + ], + "types" : [ + { + "accessLevel" : "internal", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "ClosureAsyncImports", + "setters" : [ + + ], + "staticMethods" : [ { "accessLevel" : "internal", "effects" : { @@ -22016,240 +23922,281 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripBoolArray", + "name" : "runJsClosureAsyncTests", "parameters" : [ - { - "name" : "values", - "type" : { - "array" : { - "_0" : { - "bool" : { - } - } - } - } - } ], "returnType" : { - "array" : { - "_0" : { - "bool" : { + "void" : { - } - } } } - }, + } + ] + } + ] + }, + { + "functions" : [ + + ], + "types" : [ + { + "accessLevel" : "internal", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "ClosureSupportImports", + "setters" : [ + + ], + "staticMethods" : [ { "accessLevel" : "internal", "effects" : { - "isAsync" : true, + "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripIntArray", + "name" : "jsApplyVoid", "parameters" : [ { - "name" : "values", + "name" : "callback", "type" : { - "array" : { + "closure" : { "_0" : { - "double" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_y", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ - } - } + ], + "returnType" : { + "void" : { + + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : true } } } ], "returnType" : { - "array" : { - "_0" : { - "double" : { + "void" : { - } - } } } }, { "accessLevel" : "internal", "effects" : { - "isAsync" : true, + "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripStringArray", + "name" : "jsApplyBool", "parameters" : [ { - "name" : "values", + "name" : "callback", "type" : { - "array" : { + "closure" : { "_0" : { - "string" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsy_Sb", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ - } - } + ], + "returnType" : { + "bool" : { + + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : true } } } ], "returnType" : { - "array" : { - "_0" : { - "string" : { + "bool" : { - } - } } } }, { "accessLevel" : "internal", "effects" : { - "isAsync" : true, + "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripFeatureFlag", + "name" : "jsApplyInt", "parameters" : [ { - "name" : "v", + "name" : "value", "type" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "String" + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + ], + "returnType" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : true } } } ], "returnType" : { - "rawValueEnum" : { - "_0" : "FeatureFlag", - "_1" : "String" + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } } } }, { "accessLevel" : "internal", "effects" : { - "isAsync" : true, + "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripAssociatedValueEnum", + "name" : "jsApplyDouble", "parameters" : [ { - "name" : "v", + "name" : "value", "type" : { - "associatedValueEnum" : { - "_0" : "AsyncImportedPayloadResult" + "double" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { + "_0" : { + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "double" : { + + } + } + ], + "returnType" : { + "double" : { + + } + }, + "sendingParameters" : false + }, + "useJSTypedClosure" : true } } } ], - "returnType" : { - "associatedValueEnum" : { - "_0" : "AsyncImportedPayloadResult" + "returnType" : { + "double" : { + } } }, { "accessLevel" : "internal", "effects" : { - "isAsync" : true, + "isAsync" : false, "isStatic" : false, "isThrows" : true }, - "name" : "jsAsyncRoundTripOptionalAssociatedValueEnum", + "name" : "jsApplyString", "parameters" : [ { - "name" : "v", + "name" : "value", "type" : { - "nullable" : { + "string" : { + + } + } + }, + { + "name" : "transform", + "type" : { + "closure" : { "_0" : { - "associatedValueEnum" : { - "_0" : "AsyncImportedPayloadResult" - } + "isAsync" : false, + "isThrows" : false, + "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "moduleName" : "BridgeJSRuntimeTests", + "parameters" : [ + { + "string" : { + + } + } + ], + "returnType" : { + "string" : { + + } + }, + "sendingParameters" : false }, - "_1" : "null" + "useJSTypedClosure" : true } } } ], "returnType" : { - "nullable" : { - "_0" : { - "associatedValueEnum" : { - "_0" : "AsyncImportedPayloadResult" - } - }, - "_1" : "null" - } - } - } - ] - } - ] - }, - { - "functions" : [ - - ], - "types" : [ - { - "accessLevel" : "internal", - "getters" : [ - - ], - "methods" : [ - - ], - "name" : "ClosureAsyncImports", - "setters" : [ - - ], - "staticMethods" : [ - { - "accessLevel" : "internal", - "effects" : { - "isAsync" : true, - "isStatic" : false, - "isThrows" : true - }, - "name" : "runJsClosureAsyncTests", - "parameters" : [ - - ], - "returnType" : { - "void" : { + "string" : { } } - } - ] - } - ] - }, - { - "functions" : [ - - ], - "types" : [ - { - "accessLevel" : "internal", - "getters" : [ - - ], - "methods" : [ - - ], - "name" : "ClosureSupportImports", - "setters" : [ - - ], - "staticMethods" : [ + }, { "accessLevel" : "internal", "effects" : { @@ -22257,22 +24204,34 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyVoid", + "name" : "jsApplyJSObject", "parameters" : [ { - "name" : "callback", + "name" : "value", + "type" : { + "jsObject" : { + + } + } + }, + { + "name" : "transform", "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsy_y", + "mangleName" : "20BridgeJSRuntimeTests8JSObjectC_8JSObjectC", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ + { + "jsObject" : { + } + } ], "returnType" : { - "void" : { + "jsObject" : { } }, @@ -22284,7 +24243,7 @@ } ], "returnType" : { - "void" : { + "jsObject" : { } } @@ -22296,23 +24255,56 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyBool", + "name" : "jsApplyArrayInt", "parameters" : [ { - "name" : "callback", + "name" : "value", + "type" : { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } + }, + { + "name" : "transform", "type" : { "closure" : { "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsy_Sb", + "mangleName" : "20BridgeJSRuntimeTestsSaSi_SaSi", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ - + { + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + } + } ], "returnType" : { - "bool" : { - + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } }, "sendingParameters" : false @@ -22323,8 +24315,15 @@ } ], "returnType" : { - "bool" : { - + "array" : { + "_0" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } } } }, @@ -22335,15 +24334,16 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyInt", + "name" : "jsApplyArrayDouble", "parameters" : [ { "name" : "value", "type" : { - "integer" : { + "array" : { "_0" : { - "isSigned" : true, - "width" : "word" + "double" : { + + } } } } @@ -22355,23 +24355,25 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSi_Si", + "mangleName" : "20BridgeJSRuntimeTestsSaSd_SaSd", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "integer" : { + "array" : { "_0" : { - "isSigned" : true, - "width" : "word" + "double" : { + + } } } } ], "returnType" : { - "integer" : { + "array" : { "_0" : { - "isSigned" : true, - "width" : "word" + "double" : { + + } } } }, @@ -22383,10 +24385,11 @@ } ], "returnType" : { - "integer" : { + "array" : { "_0" : { - "isSigned" : true, - "width" : "word" + "double" : { + + } } } } @@ -22398,13 +24401,17 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyDouble", + "name" : "jsApplyArrayString", "parameters" : [ { "name" : "value", "type" : { - "double" : { + "array" : { + "_0" : { + "string" : { + } + } } } }, @@ -22415,18 +24422,26 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSd_Sd", + "mangleName" : "20BridgeJSRuntimeTestsSaSS_SaSS", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "double" : { + "array" : { + "_0" : { + "string" : { + } + } } } ], "returnType" : { - "double" : { + "array" : { + "_0" : { + "string" : { + } + } } }, "sendingParameters" : false @@ -22437,8 +24452,12 @@ } ], "returnType" : { - "double" : { + "array" : { + "_0" : { + "string" : { + } + } } } }, @@ -22449,13 +24468,17 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyString", + "name" : "jsApplyArrayJSValue", "parameters" : [ { "name" : "value", "type" : { - "string" : { + "array" : { + "_0" : { + "jsValue" : { + } + } } } }, @@ -22466,18 +24489,26 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTestsSS_SS", + "mangleName" : "20BridgeJSRuntimeTestsSa7JSValueV_Sa7JSValueV", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "string" : { + "array" : { + "_0" : { + "jsValue" : { + } + } } } ], "returnType" : { - "string" : { + "array" : { + "_0" : { + "jsValue" : { + } + } } }, "sendingParameters" : false @@ -22488,8 +24519,12 @@ } ], "returnType" : { - "string" : { + "array" : { + "_0" : { + "jsValue" : { + } + } } } }, @@ -22500,13 +24535,17 @@ "isStatic" : false, "isThrows" : true }, - "name" : "jsApplyJSObject", + "name" : "jsApplyArrayJSObject", "parameters" : [ { "name" : "value", "type" : { - "jsObject" : { + "array" : { + "_0" : { + "jsObject" : { + } + } } } }, @@ -22517,18 +24556,26 @@ "_0" : { "isAsync" : false, "isThrows" : false, - "mangleName" : "20BridgeJSRuntimeTests8JSObjectC_8JSObjectC", + "mangleName" : "20BridgeJSRuntimeTestsSa8JSObjectC_Sa8JSObjectC", "moduleName" : "BridgeJSRuntimeTests", "parameters" : [ { - "jsObject" : { + "array" : { + "_0" : { + "jsObject" : { + } + } } } ], "returnType" : { - "jsObject" : { + "array" : { + "_0" : { + "jsObject" : { + } + } } }, "sendingParameters" : false @@ -22539,8 +24586,12 @@ } ], "returnType" : { - "jsObject" : { + "array" : { + "_0" : { + "jsObject" : { + } + } } } }, @@ -24479,6 +26530,49 @@ "returnType" : { "string" : { + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsDescribeReservedWordParameters", + "parameters" : [ + { + "name" : "in", + "type" : { + "integer" : { + "_0" : { + "isSigned" : true, + "width" : "word" + } + } + } + }, + { + "name" : "for", + "type" : { + "string" : { + + } + } + }, + { + "name" : "default", + "type" : { + "bool" : { + + } + } + } + ], + "returnType" : { + "string" : { + } } } @@ -24497,7 +26591,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericRoundTrip", "parameters" : [ @@ -24524,7 +26620,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericRoundTripClass", "parameters" : [ @@ -24551,7 +26649,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericParsePoint", "parameters" : [ @@ -24578,7 +26678,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsImportPickFirst", "parameters" : [ @@ -24613,7 +26715,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsImportMakeInt", "parameters" : [ @@ -24633,8 +26737,12 @@ "isThrows" : true }, "genericParameters" : [ - "T", - "U" + { + "name" : "T" + }, + { + "name" : "U" + } ], "name" : "jsImportCombineSecond", "parameters" : [ @@ -24669,7 +26777,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericArrayRoundTrip", "parameters" : [ @@ -24704,7 +26814,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericOptionalRoundTrip", "parameters" : [ @@ -24741,7 +26853,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericDictRoundTrip", "parameters" : [ @@ -24776,7 +26890,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericAfterOptionalArray", "parameters" : [ @@ -24823,7 +26939,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "jsGenericThrowOrRoundTrip", "parameters" : [ @@ -24849,6 +26967,64 @@ "_0" : "T" } } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericRTNode" + ], + "name" : "T" + } + ], + "name" : "jsGenericNodeRoundTrip", + "parameters" : [ + { + "name" : "value", + "type" : { + "generic" : { + "_0" : "T" + } + } + } + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "genericParameters" : [ + { + "constraints" : [ + "GenericRTPosition", + "GenericRTNode" + ], + "name" : "T" + } + ], + "name" : "jsGenericMakeNode", + "parameters" : [ + + ], + "returnType" : { + "generic" : { + "_0" : "T" + } + } } ], "types" : [ @@ -24872,7 +27048,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "identity", "parameters" : [ @@ -24905,7 +27083,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "box", "parameters" : [ @@ -24931,7 +27111,9 @@ "constructor" : { "accessLevel" : "internal", "genericParameters" : [ - "T" + { + "name" : "T" + } ], "parameters" : [ { @@ -24956,7 +27138,9 @@ "isThrows" : true }, "genericParameters" : [ - "T" + { + "name" : "T" + } ], "name" : "unwrap", "parameters" : [ @@ -26729,6 +28913,135 @@ } ] }, + { + "functions" : [ + + ], + "types" : [ + { + "accessLevel" : "internal", + "getters" : [ + + ], + "methods" : [ + + ], + "name" : "StringABIImports", + "setters" : [ + + ], + "staticMethods" : [ + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsEcho", + "parameters" : [ + { + "name" : "value", + "type" : { + "string" : { + + } + } + } + ], + "returnType" : { + "string" : { + + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsEchoOptional", + "parameters" : [ + { + "name" : "value", + "type" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + } + ], + "returnType" : { + "nullable" : { + "_0" : { + "string" : { + + } + }, + "_1" : "null" + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "jsEchoArray", + "parameters" : [ + { + "name" : "value", + "type" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + } + ], + "returnType" : { + "array" : { + "_0" : { + "string" : { + + } + } + } + } + }, + { + "accessLevel" : "internal", + "effects" : { + "isAsync" : false, + "isStatic" : false, + "isThrows" : true + }, + "name" : "runJsStringABITests", + "parameters" : [ + + ], + "returnType" : { + "void" : { + + } + } + } + ] + } + ] + }, { "functions" : [ { diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift index c98ab3e61..b3e921672 100644 --- a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift +++ b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift @@ -31,6 +31,12 @@ import JavaScriptKit _ b: [Int] ) throws(JSException) -> String +@JSFunction func jsDescribeReservedWordParameters( + in: Int, + for: String, + _ `default`: Bool +) throws(JSException) -> String + class ImportAPITests: XCTestCase { func testRoundTripVoid() throws { try jsRoundTripVoid() @@ -211,4 +217,8 @@ class ImportAPITests: XCTestCase { #""s"|[1,2]|[7,8,9]"# ) } + + func testReservedWordParameters() throws { + XCTAssertEqual(try jsDescribeReservedWordParameters(in: 1, for: "for", true), "1:for:true") + } } diff --git a/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift b/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift index bfd63839f..c5484edc6 100644 --- a/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/ImportGenericAPIs.swift @@ -79,7 +79,34 @@ import JavaScriptKit @JSFunction func unwrap() throws(JSException) -> T } +@JS protocol GenericRTPosition: BridgedSwiftGenericBridgeable { + var x: Int { get } + func sum() -> Int +} + +@JS protocol GenericRTNode: GenericRTPosition { + var y: Int { get } +} + +extension GenericRTPoint: GenericRTNode { + @JS func sum() -> Int { x + y } +} + +@JSFunction func jsGenericNodeRoundTrip(_ value: T) throws(JSException) -> T +@JSFunction func jsGenericMakeNode() + throws(JSException) -> T + @Suite struct ImportGenericAPITests { + @Test func constrainedProtocolRoundTrip() throws { + let point = try jsGenericNodeRoundTrip(GenericRTPoint(x: 1, y: 2)) + #expect(point.sum() == 3) + let node: AnyGenericRTNode = try jsGenericMakeNode() + #expect(node.x == 3) + #expect(node.y == 4) + #expect(node.sum() == 7) + #expect(try jsGenericNodeRoundTrip(node).jsObject == node.jsObject) + } + @Test func genericRoundTripScalars() throws { #expect(try jsGenericRoundTrip(42) == 42) #expect(try jsGenericRoundTrip(-7) == -7) @@ -278,3 +305,30 @@ import JavaScriptKit #expect(color == .green) } } + +@JS protocol RefineIdentified { + var id: String { get } + var score: Int { get set } +} + +@JS protocol RefineNamed { + var name: String { get } + func label() -> String +} + +@JS protocol RefineEntity: RefineIdentified, RefineNamed { + var id: String { get } + func label() -> String +} + +@JS func describeRefinedEntity(_ entity: RefineEntity) -> String { + var identified: any RefineIdentified = entity + identified.score = entity.score + 1 + return "\(entity.id):\(entity.name):\(entity.label()):\(identified.score)" +} + +@JS protocol RefineTagged: RefineEntity {} + +@JS func describeTaggedEntity(_ entity: RefineTagged) -> String { + "\(entity.id)/\(entity.name)/\(entity.score)" +} diff --git a/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift b/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift index 48efcff59..43d5b1fc5 100644 --- a/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/JSNameAPIs.swift @@ -12,7 +12,7 @@ import JavaScriptKit return "Hello, \(count) people!" } -@JS class JSNameRenamedClass { +@JS("NamedCounter") class JSNameRenamedClass { private var storage: Int @JS init(value: Int) { @@ -32,3 +32,21 @@ import JavaScriptKit return JSNameRenamedClass(value: value) } } + +@JS("CounterSnapshot") struct JSNameSnapshot { + var value: Int + + @JS init(value: Int) { + self.value = value + } +} + +@JS("CounterTransform") protocol JSNameTransformer { + func apply(_ value: Int) -> Int +} + +@JS("CounterTools", namespace: "Renaming") enum JSNameTools { + @JS static func apply(_ transformer: JSNameTransformer, _ value: Int) -> Int { + transformer.apply(value) + } +} diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs index 9be7af1be..a0f9a6ebd 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs @@ -44,6 +44,12 @@ export function getImports(importsContext) { jsAsyncRoundTripOptionalAssociatedValueEnum: (v) => { return Promise.resolve(v); }, + jsAsyncThrowSynchronously: (message) => { + throw new Error(message); + }, + jsAsyncReturnNonPromise: (v) => { + return v; + }, }; } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs index 57a824aa4..07b1ec1ed 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs @@ -38,6 +38,14 @@ export async function runJsClosureAsyncTests(exports) { assert.notEqual(directionAReject, null); assert.equal(directionAReject.message, "CallbackRejected"); + await assert.rejects( + () => exports.awaitAsyncCallback(() => { + throw new Error("CallbackThrewSynchronously"); + }), + (error) => error instanceof Error && error.message === "CallbackThrewSynchronously" + ); + assert.equal(await exports.awaitAsyncCallback((req) => `plain-${req}`), "swift-saw:plain-request"); + const parser = exports.makeAsyncParser(); const parsed = parser("42"); @@ -128,4 +136,13 @@ export async function runJsClosureAsyncTests(exports) { concurrent.release(); } } + + const first = exports.roundTripArrayMembers({ ints: [10], optStrings: null }); + const second = exports.roundTripArrayMembers({ ints: [20], optStrings: null }); + assert.deepEqual(await Promise.all([first.ownSumAsync(), second.ownSumAsync()]), [10, 20]); + assert.deepEqual(await Promise.all([first.sumAsync([1]), second.sumAsync([2])]), [11, 22]); + + const sum = exports.makeAsyncArraySum(); + assert.deepEqual(await Promise.all([sum([1, 2]), sum([10, 20])]), [3, 30]); + assert.equal(await exports.awaitArraySum(async (values) => values.reduce((a, b) => a + b, 0)), 6); } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs index 9461bec1f..2ddc8c866 100644 --- a/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs +++ b/Tests/BridgeJSRuntimeTests/JavaScript/ClosureSupportTests.mjs @@ -411,4 +411,7 @@ export function runJsClosureSupportTests(exports) { const jsStringToString = exports.ClosureSupportExports.makeJSStringToString("Hello, "); assert.equal(jsStringToString("world!"), "Hello, world!"); + + const difference = exports.ClosureSupportExports.makeArrayDifference(); + assert.equal(difference([1, 2], [10, 20]), -27); } diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/JSNameTests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/JSNameTests.mjs new file mode 100644 index 000000000..5b7ddd1fa --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/JSNameTests.mjs @@ -0,0 +1,37 @@ +// @ts-check + +import assert from "node:assert"; + +/** + * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports + */ +export function runJSNameTests(exports) { + assert.equal(exports.renamedEcho("hi"), "echo: hi"); + assert.ok(!("jsNameEcho" in exports)); + assert.equal(exports.greetName("John"), "Hello, John!"); + assert.equal(exports.greetCount(3), "Hello, 3 people!"); + assert.ok(!("JSNameRenamedClass" in exports)); + + /** @type {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').NamedCounter} */ + const counter = new exports.NamedCounter(21); + assert.equal(counter.doubled(), 42); + assert.equal(counter.current, 21); + counter.current = 5; + assert.equal(counter.doubled(), 10); + const made = exports.NamedCounter.makeWithValue(7); + assert.equal(made.current, 7); + assert.ok(made instanceof exports.NamedCounter); + + /** @type {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').CounterSnapshot} */ + const snapshot = exports.CounterSnapshot.init(9); + assert.equal(snapshot.value, 9); + + /** @type {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').CounterTransform} */ + const transformer = { + apply(value) { return value * 2; }, + }; + assert.equal(exports.Renaming.CounterTools.apply(transformer, 6), 12); + + made.release(); + counter.release(); +} diff --git a/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs b/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs new file mode 100644 index 000000000..1ff321261 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/JavaScript/StringABITests.mjs @@ -0,0 +1,52 @@ +// @ts-check + +import assert from 'node:assert'; + +/** + * @returns {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Imports["StringABIImports"]} + */ +export function getImports(importsContext) { + return { + jsEcho: (value) => value, + jsEchoArray: (value) => value, + jsEchoOptional: (value) => value ?? null, + runJsStringABITests: () => { + const exports = importsContext.getExports(); + if (!exports) { throw new Error("No exports!?"); } + runJsStringABITests(exports); + }, + }; +} + +/** + * Swift→JS string layout coverage: small, immortal, dynamic, substring, optional. + * @param {import('../../../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} rootExports + */ +export function runJsStringABITests(rootExports) { + const exports = rootExports.StringABIExports; + const immortal = "this is a long immortal literal string"; + + assert.equal(exports.smallEmpty(), ""); + assert.equal(exports.smallASCII(), "div"); + assert.equal(exports.smallEight(), "abcdefgh"); + assert.equal(exports.smallNine(), "abcdefghi"); + assert.equal(exports.smallTen(), "abcdefghij"); + assert.equal(exports.smallUTF8(), "é"); + assert.equal(exports.largeImmortal(), immortal); + assert.equal(exports.largeImmortalAgain(), immortal); + assert.equal(exports.largeDynamic(), immortal); + assert.equal(exports.immortalSubstring(), immortal.slice(10)); + assert.equal(exports.optionalNone(), null); + assert.equal(exports.optionalSome(), immortal); + for (let i = 0; i < samples.length; i++) { + assert.equal(exports.echo(samples[i]), samples[i]); + assert.equal(exports.echoOptional(samples[i]), samples[i]); + } + assert.deepEqual(exports.echoArray(samples), samples); +} + +const samples = [ + "abcdefé", "abcdefgé", "abcdefghé", "abcdefghié", "abc€", "abcdefg€", + "abc😄", "abcdef😄", "abcdefg😄", "a\0b", "\ufeff", "\ufeffx", "\ufeffabcde", "\ufeffabcdef", "x\ufeff", + "\ufeff\ufeffx", "\ufeffabcdefghijk", "abc\ufeffdefghijk", "\ufeff\ufeffabcdefghijk", +]; diff --git a/Tests/BridgeJSRuntimeTests/StringABITests.swift b/Tests/BridgeJSRuntimeTests/StringABITests.swift new file mode 100644 index 000000000..5d2cae9b0 --- /dev/null +++ b/Tests/BridgeJSRuntimeTests/StringABITests.swift @@ -0,0 +1,80 @@ +import XCTest +import JavaScriptKit +import JavaScriptEventLoop + +private let largeImmortalLiteral = "this is a long immortal literal string" + +@inline(never) +private func runtimeCopy(_ string: String) -> String { + String(decoding: Array(string.utf8), as: UTF8.self) +} + +@JSClass struct StringABIImports { + @JSFunction static func jsEcho(_ value: String) throws(JSException) -> String + @JSFunction static func jsEchoOptional(_ value: String?) throws(JSException) -> String? + @JSFunction static func jsEchoArray(_ value: [String]) throws(JSException) -> [String] + @JSFunction static func runJsStringABITests() throws(JSException) +} + +@JS enum StringABIExports { + @JS static func echo(_ value: String) -> String { value } + @JS static func echoOptional(_ value: String?) -> String? { value } + @JS static func echoArray(_ value: [String]) -> [String] { value } + @JS static func smallEmpty() -> String { "" } + @JS static func smallASCII() -> String { "div" } + @JS static func smallEight() -> String { "abcdefgh" } + @JS static func smallNine() -> String { "abcdefghi" } + @JS static func smallTen() -> String { "abcdefghij" } + @JS static func smallUTF8() -> String { "é" } + @JS static func largeImmortal() -> String { largeImmortalLiteral } + @JS static func largeImmortalAgain() -> String { largeImmortalLiteral } + @JS static func largeDynamic() -> String { runtimeCopy(largeImmortalLiteral) } + @JS static func immortalSubstring() -> String { String(largeImmortalLiteral.dropFirst(10)) } + @JS static func optionalNone() -> String? { nil } + @JS static func optionalSome() -> String? { largeImmortalLiteral } +} + +final class StringABITests: XCTestCase { + func testRunJsStringABITests() throws { + try StringABIImports.runJsStringABITests() + } + + func testUnicodeAndBOMParametersAndStacks() throws { + let samples = [ + "abcdefé", "abcdefgé", "abcdefghé", "abcdefghié", + "abc€", "abcdefg€", "abc😄", "abcdef😄", "abcdefg😄", "a\0b", + "\u{FEFF}", "\u{FEFF}x", "\u{FEFF}abcde", "\u{FEFF}abcdef", "x\u{FEFF}", "\u{FEFF}\u{FEFF}x", + "\u{FEFF}abcdefghijk", "abc\u{FEFF}defghijk", "\u{FEFF}\u{FEFF}abcdefghijk", + ] + for input in samples { + try XCTAssertEqual(StringABIImports.jsEcho(input), input) + try XCTAssertEqual(StringABIImports.jsEchoOptional(input), input) + } + try XCTAssertEqual(StringABIImports.jsEchoArray(samples), samples) + } + + func testImportEchoesSmallStrings() throws { + try XCTAssertEqual(StringABIImports.jsEcho(""), "") + try XCTAssertEqual(StringABIImports.jsEcho("div"), "div") + try XCTAssertEqual(StringABIImports.jsEcho("abcdefgh"), "abcdefgh") + try XCTAssertEqual(StringABIImports.jsEcho("abcdefghi"), "abcdefghi") + try XCTAssertEqual(StringABIImports.jsEcho("abcdefghij"), "abcdefghij") + try XCTAssertEqual(StringABIImports.jsEcho("é"), "é") + } + + func testImportEchoesLargeImmortalAndDynamicStrings() throws { + try XCTAssertEqual(StringABIImports.jsEcho(largeImmortalLiteral), largeImmortalLiteral) + try XCTAssertEqual(StringABIImports.jsEcho(largeImmortalLiteral), largeImmortalLiteral) + try XCTAssertEqual(StringABIImports.jsEcho(runtimeCopy(largeImmortalLiteral)), largeImmortalLiteral) + try XCTAssertEqual( + StringABIImports.jsEcho(String(largeImmortalLiteral.dropFirst(10))), + String(largeImmortalLiteral.dropFirst(10)) + ) + } + + func testImportEchoesOptionalStrings() throws { + try XCTAssertNil(StringABIImports.jsEchoOptional(nil)) + try XCTAssertEqual(StringABIImports.jsEchoOptional("div"), "div") + try XCTAssertEqual(StringABIImports.jsEchoOptional(largeImmortalLiteral), largeImmortalLiteral) + } +} diff --git a/Tests/BridgeJSRuntimeTests/StructAPIs.swift b/Tests/BridgeJSRuntimeTests/StructAPIs.swift index e11856d41..c74ee1a75 100644 --- a/Tests/BridgeJSRuntimeTests/StructAPIs.swift +++ b/Tests/BridgeJSRuntimeTests/StructAPIs.swift @@ -327,6 +327,21 @@ extension Vector2D { @JS func firstString(_ values: [String]) -> String? { values.first } + + @JS func ownSumAsync() async -> Int { + ints.reduce(0, +) + } + + @JS func sumAsync(_ values: [Int]) async -> Int { + ints.reduce(0, +) + values.reduce(0, +) + } + + @JS func requireValues(_ values: [Int]) throws(JSException) -> [Int] { + guard !values.isEmpty else { + throw JSException(JSError(message: "Values must not be empty").jsValue) + } + return ints + values + } } @JS func roundTripArrayMembers(_ value: ArrayMembers) -> ArrayMembers { diff --git a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift index 8fbbd817f..7fbb712a7 100644 --- a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift +++ b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopTests.swift @@ -113,6 +113,113 @@ final class JavaScriptEventLoopTests: XCTestCase { XCTAssertEqual(context.completed, ["t4", "t3", "t5"]) } + final class OrderContext: @unchecked Sendable { + var completed: [String] = [] + var expectedCount = 0 + var continuation: CheckedContinuation? + + func record(_ name: String) { + completed.append(name) + if completed.count == expectedCount { + continuation?.resume() + continuation = nil + } + } + } + + /// Starts tasks without awaiting them, so no await raises the priority of a queued task. + func runUnawaited(expectedCount: Int, _ start: (OrderContext) -> Void) async -> [String] { + let context = OrderContext() + context.expectedCount = expectedCount + await withCheckedContinuation { continuation in + context.continuation = continuation + start(context) + } + return context.completed + } + + func testTaskPriorityOrderWithMixedPriorities() async throws { + let burst: [(String, TaskPriority)] = [ + ("low1", .low), ("medium1", .medium), ("low2", .low), ("high1", .high), + ("medium2", .medium), ("low3", .low), ("high2", .high), ("medium3", .medium), + ] + let burstOrder = await runUnawaited(expectedCount: burst.count) { context in + for (name, priority) in burst { + Task(priority: priority) { context.record(name) } + } + } + XCTAssertEqual(burstOrder, ["high1", "high2", "medium1", "medium2", "medium3", "low1", "low2", "low3"]) + + let nestedOrder = await runUnawaited(expectedCount: 7) { context in + Task(priority: .medium) { + context.record("outer") + let nested: [(String, TaskPriority)] = [ + ("nestedLow1", .low), ("nestedHigh", .high), ("nestedMedium", .medium), ("nestedLow2", .low), + ] + for (name, priority) in nested { + Task(priority: priority) { context.record(name) } + } + } + Task(priority: .medium) { context.record("medium") } + Task(priority: .low) { context.record("low") } + } + XCTAssertEqual( + nestedOrder, + ["outer", "nestedHigh", "medium", "nestedMedium", "low", "nestedLow1", "nestedLow2"] + ) + + let priorities: [TaskPriority] = [ + .low, .high, .background, .medium, TaskPriority(rawValue: 22), TaskPriority(rawValue: 5), + ] + let many = (0..<600).map { index in ("\(index)", priorities[index % priorities.count]) } + let manyOrder = await runUnawaited(expectedCount: many.count) { context in + for (name, priority) in many { + Task(priority: priority) { context.record(name) } + } + } + let expectedManyOrder = many.enumerated() + .sorted { lhs, rhs in + lhs.element.1.rawValue != rhs.element.1.rawValue + ? lhs.element.1.rawValue > rhs.element.1.rawValue + : lhs.offset < rhs.offset + } + .map(\.element.0) + XCTAssertEqual(manyOrder, expectedManyOrder) + } + + func testTaskPriorityOrderAfterQueueEmpties() async throws { + let rounds: [[(String, TaskPriority)]] = [ + [("low1", .low), ("low2", .low), ("high1", .high), ("low3", .low)], + [("high1", .high), ("medium1", .medium), ("high2", .high), ("low1", .low)], + [("medium1", .medium), ("medium2", .medium), ("medium3", .medium)], + ] + let expectedOrders = [ + ["high1", "low1", "low2", "low3"], + ["high1", "high2", "medium1", "low1"], + ["medium1", "medium2", "medium3"], + ] + for (round, expectedOrder) in zip(rounds, expectedOrders) { + let order = await runUnawaited(expectedCount: round.count) { context in + for (name, priority) in round { + Task(priority: priority) { context.record(name) } + } + } + XCTAssertEqual(order, expectedOrder) + } + } + + func testTaskPriorityOrderAfterSingleJobRunIsClaimed() async throws { + let order = await runUnawaited(expectedCount: 4) { context in + Task(priority: .low) { context.record("low1") } + Task(priority: .low) { context.record("low2") } + Task(priority: .high) { + context.record("high") + Task(priority: .low) { context.record("low3") } + } + } + XCTAssertEqual(order, ["high", "low1", "low2", "low3"]) + } + // MARK: - Promise Tests func testPromiseResolution() async throws { diff --git a/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift new file mode 100644 index 000000000..a18c162ce --- /dev/null +++ b/Tests/JavaScriptEventLoopTests/JavaScriptEventLoopYieldIntervalTests.swift @@ -0,0 +1,106 @@ +import JavaScriptEventLoop +import JavaScriptKit +import XCTest + +final class JavaScriptEventLoopYieldIntervalTests: XCTestCase { + final class Box: @unchecked Sendable { + var value: Value + init(_ value: Value) { self.value = value } + } + + override func tearDown() { + JavaScriptEventLoop.shared.yieldInterval = nil + super.tearDown() + } + + static func busyWait(milliseconds: Int) { + let end = ContinuousClock.now + .milliseconds(milliseconds) + while ContinuousClock.now < end {} + } + + /// Returns, for each busy task, whether a JavaScript timer scheduled before them had fired. + func timerRanAfterEachTask(count: Int, milliseconds: Int) async -> [Bool] { + let timerRan = Box(false) + _ = JSObject.global.setTimeout!( + JSOneshotClosure { _ in + timerRan.value = true + return .undefined + }, + 0 + ) + let observed = Box([Bool]()) + let tasks = (0..) in + @Sendable func record(_ name: String) { + Self.busyWait(milliseconds: 1) + order.value.append(name) + if order.value.count == expectedOrder.count { continuation.resume() } + } + let priorities: [(String, TaskPriority)] = [("l", .low), ("m", .medium), ("h", .high)] + for index in 0..<12 { + let (prefix, priority) = priorities[index % 3] + let name = "\(prefix)\(index / 3)" + Task(priority: priority) { + record(name) + if name == "h0" { + Task(priority: .low) { record("l4") } + Task(priority: .high) { record("h4") } + } + } + } + } + XCTAssertEqual(order.value, expectedOrder) + } +} diff --git a/Tests/JavaScriptKitTests/JSTypedArrayTests.swift b/Tests/JavaScriptKitTests/JSTypedArrayTests.swift index a4649879e..ad12a4e81 100644 --- a/Tests/JavaScriptKitTests/JSTypedArrayTests.swift +++ b/Tests/JavaScriptKitTests/JSTypedArrayTests.swift @@ -110,6 +110,84 @@ final class JSTypedArrayTests: XCTestCase { } } + func testTypedArrayWithByteOffset() { + // A view over part of a larger `ArrayBuffer`: `byteOffset` is non-zero and + // `byteLength` is smaller than the backing buffer. Copying the whole + // buffer instead of the view's window would both shift the bytes and + // write past the end of the destination, which is sized from `length`. + let backingLength = 32 + let viewOffset = 8 + let viewLength = 8 + + let arrayBuffer = JSObject.global.ArrayBuffer.function!.new(backingLength) + let wholeBuffer = JSTypedArray( + unsafelyWrapping: JSObject.global.Uint8Array.function!.new(arrayBuffer) + ) + for i in 0..( + unsafelyWrapping: JSObject.global.Uint8Array.function!.new( + arrayBuffer, + viewOffset, + viewLength + ) + ) + XCTAssertEqual(view.length, viewLength) + XCTAssertEqual(view.lengthInBytes, viewLength) + + let expected = (0...allocate(capacity: backingLength) + defer { storage.deallocate() } + storage.initialize(repeating: sentinel) + let destination = UnsafeMutableBufferPointer(rebasing: storage[0..(elements).jsObject.buffer.object! + let view = JSTypedArray( + unsafelyWrapping: JSObject.global.Int32Array.function!.new( + arrayBuffer, + viewOffsetInBytes, + viewLength + ) + ) + XCTAssertEqual(view.length, viewLength) + XCTAssertEqual(view.lengthInBytes, viewLength * MemoryLayout.size) + + let expected: [Int32] = [3, 4, 5, 6] + XCTAssertEqual(view.withUnsafeBytes { Array($0) }, expected) + + let sentinel = Int32(bitPattern: 0xDEAD_BEEF) + let storage = UnsafeMutableBufferPointer.allocate(capacity: elements.count) + defer { storage.deallocate() } + storage.initialize(repeating: sentinel) + let destination = UnsafeMutableBufferPointer(rebasing: storage[0..(length: 100) for i in 0..<100 { diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs index 78271e1ba..6c53eb59f 100644 --- a/Tests/prelude.mjs +++ b/Tests/prelude.mjs @@ -11,6 +11,7 @@ import { getImports as getClosureThrowsImports } from './BridgeJSRuntimeTests/Ja import { getImports as getClosureAsyncImports } from './BridgeJSRuntimeTests/JavaScript/ClosureAsyncTests.mjs'; import { getImports as getSwiftClassSupportImports } from './BridgeJSRuntimeTests/JavaScript/SwiftClassSupportTests.mjs'; import { getImports as getOptionalSupportImports } from './BridgeJSRuntimeTests/JavaScript/OptionalSupportTests.mjs'; +import { getImports as getStringABIImports } from './BridgeJSRuntimeTests/JavaScript/StringABITests.mjs'; import { getImports as getArraySupportImports, ArrayElementObject } from './BridgeJSRuntimeTests/JavaScript/ArraySupportTests.mjs'; import { getImports as getDictionarySupportImports } from './BridgeJSRuntimeTests/JavaScript/DictionarySupportTests.mjs'; import { getImports as getDefaultArgumentImports } from './BridgeJSRuntimeTests/JavaScript/DefaultArgumentTests.mjs'; @@ -19,6 +20,7 @@ import { getImports as getIntegerTypesSupportImports } from './BridgeJSRuntimeTe import { getImports as getAsyncImportImports, runAsyncWorksTests } from './BridgeJSRuntimeTests/JavaScript/AsyncImportTests.mjs'; import { getImports as getJSTypedArrayImports } from './BridgeJSRuntimeTests/JavaScript/JSTypedArrayTests.mjs'; import { getImports as getIdentityModeTestImports } from './BridgeJSIdentityTests/JavaScript/IdentityModeTests.mjs'; +import { runJSNameTests } from './BridgeJSRuntimeTests/JavaScript/JSNameTests.mjs'; /** @type {import('../.build/plugins/PackageToJS/outputs/PackageTests/test.d.ts').SetupOptionsFn} */ export async function setupOptions(options, context) { @@ -143,6 +145,7 @@ export async function setupOptions(options, context) { throw new Error("No exports!?"); } await runAsyncWorksTests(exports); + await testAsyncProtocolSupport(exports); return; }, AsyncImportImports: getAsyncImportImports(importsContext), @@ -161,6 +164,7 @@ export async function setupOptions(options, context) { jsJoinOptionalStructThenArray: joinStackParams, jsJoinEnumThenArray: joinStackParams, jsJoinStringThenStackParams: joinStackParams, + jsDescribeReservedWordParameters: (a, b, c) => `${a}:${b}:${c}`, jsGenericRoundTrip: (v) => v, jsGenericRoundTripClass: (v) => v, jsGenericParsePoint: (json) => JSON.parse(json), @@ -177,6 +181,11 @@ export async function setupOptions(options, context) { jsGenericOptionalRoundTrip: (v) => v, jsGenericDictRoundTrip: (v) => v, jsGenericAfterOptionalArray: (a, b) => `${JSON.stringify(a)}|${JSON.stringify(b)}`, + jsGenericNodeRoundTrip: (value) => { + if (value.sum() !== value.x + value.y) throw new Error("Invalid protocol method result"); + return value; + }, + jsGenericMakeNode: () => ({ x: 3, y: 4, sum() { return this.x + this.y; } }), ImportGenericConsumer: class { identity(value) { return value; @@ -206,6 +215,7 @@ export async function setupOptions(options, context) { ClosureAsyncImports: getClosureAsyncImports(importsContext), SwiftClassSupportImports: getSwiftClassSupportImports(importsContext), OptionalSupportImports: getOptionalSupportImports(importsContext), + StringABIImports: getStringABIImports(importsContext), ArraySupportImports: getArraySupportImports(importsContext), DictionarySupportImports: getDictionarySupportImports(importsContext), DefaultArgumentImports: getDefaultArgumentImports(importsContext), @@ -217,7 +227,7 @@ export async function setupOptions(options, context) { }; }, addToCoreImports(importObject, importsContext) { - const { getInstance, getExports } = importsContext; + const { getInstance, getExports, _swift } = importsContext; options.addToCoreImports?.(importObject, importsContext); importObject["JavaScriptEventLoopTestSupportTests"] = { "isMainThread": () => context.isMainThread, @@ -228,7 +238,7 @@ export async function setupOptions(options, context) { if (!exports) { throw new Error("No exports!?"); } - return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports); + return BridgeJSRuntimeTests_runJsWorks(getInstance(), exports, _swift); } bridgeJSRuntimeTests["runJsStructWorks"] = () => { const exports = getExports(); @@ -257,7 +267,7 @@ export async function setupOptions(options, context) { import assert from "node:assert"; /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ -function BridgeJSRuntimeTests_runJsWorks(instance, exports) { +function BridgeJSRuntimeTests_runJsWorks(instance, exports, swift) { exports.roundTripVoid(); for (const v of [ 0.0, 1.0, -1.0, @@ -283,6 +293,12 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.roundTripBool(v), v); } for (const v of [ + "", + "div", + "abcdefgh", + "abcdefghi", + "abcdefghij", + "é", "Hello, world!", "😄", "こんにちは", @@ -290,17 +306,32 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { ]) { assert.equal(exports.roundTripString(v), v); } + assert.equal(exports.describeReservedWordParameters(1, 2.5, true, "in"), "1:2.5:true:in"); + assert.equal(exports.describeBacktickedParameter("in"), "in"); + assert.equal(exports.describeCollidingParameters(1, 2, 3, "swift"), "1:2:3:swift"); + assert.equal( + exports.describeWithReservedWordDescriber({ describe: (a, b) => `${a}:${b}` }), + "1:for" + ); const dict = { a: 1, b: 2 }; assert.deepEqual(exports.roundTripDictionaryExport(dict), dict); const optDict = { hello: "world" }; assert.deepEqual(exports.roundTripOptionalDictionaryExport(optDict), optDict); assert.equal(exports.roundTripOptionalDictionaryExport(null), null); + const entity = { id: "e1", name: "Main", score: 10, label() { return "L" + this.score; } }; + assert.equal(exports.describeRefinedEntity(entity), "e1:Main:L11:11"); + assert.equal(entity.score, 11); + assert.equal(exports.describeTaggedEntity(entity), "e1/Main/11"); const arrayStruct = { ints: [1, 2, 3], optStrings: ["a", "b"] }; const arrayStructRoundTrip = exports.roundTripArrayMembers(arrayStruct); assert.deepEqual(arrayStructRoundTrip.ints, [1, 2, 3]); assert.deepEqual(arrayStructRoundTrip.optStrings, ["a", "b"]); assert.equal(exports.arrayMembersSum(arrayStruct, [10, 20]), 30); assert.equal(exports.arrayMembersFirst(arrayStruct, ["x", "y"]), "x"); + assert.equal(arrayStructRoundTrip.sumValues([10, 20]), 30); + assert.equal(arrayStructRoundTrip.firstString(["x", "y"]), "x"); + assert.throws(() => arrayStructRoundTrip.requireValues([]), /Values must not be empty/); + assert.deepEqual(arrayStructRoundTrip.requireValues([10, 20]), [1, 2, 3, 10, 20]); const jsValueArray = [true, 42, "ok", { nested: 1 }, null, undefined]; assert.deepEqual(exports.roundTripOptionalJSValueArray(jsValueArray), jsValueArray); assert.equal(exports.roundTripOptionalJSValueArray(null), null); @@ -313,17 +344,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.equal(exports.roundTripUnsafeMutablePointer(p), p); } - assert.equal(exports.renamedEcho("hi"), "echo: hi"); - assert.equal(exports.jsNameEcho, undefined); - assert.equal(exports.greetName("John"), "Hello, John!"); - assert.equal(exports.greetCount(3), "Hello, 3 people!"); - const renamed = new exports.JSNameRenamedClass(21); - assert.equal(renamed.doubled(), 42); - assert.equal(renamed.current, 21); - renamed.current = 5; - assert.equal(renamed.doubled(), 10); - const madeRenamed = exports.JSNameRenamedClass.makeWithValue(7); - assert.equal(madeRenamed.current, 7); + runJSNameTests(exports); const g = new exports.Greeter("John"); assert.equal(g.greet(), "Hello, John!"); @@ -589,6 +610,17 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { const result = exports.roundTripJSValue(value); assert.strictEqual(result, value); } + assert.strictEqual(exports.makeJSValueString(), "makeJSValueString"); + const madeObject = exports.makeJSValueObject(); + assert.deepStrictEqual(madeObject, {}); + + const isRetained = (value) => swift.memory._slotByValue.has(value); + assert.equal(isRetained(madeObject), false); + for (const value of [{}, "roundTripJSValue-ownership", Symbol("ownership"), 0xfedcba9876543210n]) { + assert.strictEqual(exports.roundTripJSValue(value), value); + assert.deepStrictEqual(exports.roundTripOptionalJSValueArray([value]), [value]); + assert.equal(isRetained(value), false); + } assert.strictEqual(exports.roundTripOptionalJSValue(null), null); assert.strictEqual(exports.roundTripOptionalJSValue(undefined), null); @@ -608,6 +640,9 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) { assert.fail("Expected no error"); } + assert.throws(() => exports.throwsBeforeJSObjectResult(), { name: "Error", message: "JSObjectResultError" }); + assert.throws(() => exports.throwsBeforeProtocolResult(), { name: "Error", message: "ProtocolResultError" }); + // Test enums assert.equal(exports.Direction.North, 0); assert.equal(exports.Direction.South, 1); @@ -1299,6 +1334,102 @@ function setupTestGlobals(global) { }; } +/** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ +async function testAsyncProtocolSupport(exports) { + let processorValue = 3; + let shouldRejectReset = false; + const jsProcessor = { + count: 0, + name: "AsyncJSProcessor", + optionalTag: null, + direction: null, + optionalTheme: null, + httpStatus: null, + apiResult: null, + helper: new exports.Greeter("AsyncHelper"), + optionalHelper: null, + optionalCount: null, + increment(amount) { processorValue += amount; }, + getValue() { return processorValue; }, + setLabelElements(labelPrefix, labelSuffix) { }, + getLabel() { return "async"; }, + isEven() { return processorValue % 2 === 0; }, + processGreeter(greeter) { return ""; }, + createGreeter() { return new exports.Greeter("AsyncGreeter"); }, + processOptionalGreeter(greeter) { return ""; }, + createOptionalGreeter() { return null; }, + handleAPIResult(result) { }, + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + loadLabel(key) { + if (key === "invalid") { + throw new Error("Invalid key thrown synchronously"); + } + return (async () => { + await Promise.resolve(); + if (key === "missing") { + throw new Error(`No label for ${key}`); + } + return `async:${key}`; + })(); + }, + async reset() { + await Promise.resolve(); + if (shouldRejectReset) { + throw new Error("Reset rejected"); + } + processorValue = 0; + }, + fetchCount() { return Promise.resolve(processorValue); } + }; + + const jsManager = new exports.DataProcessorManager(jsProcessor); + + assert.equal(await jsManager.loadProcessorLabel("key"), "async:key"); + await assert.rejects( + () => jsManager.loadProcessorLabel("missing"), + (error) => error instanceof Error && error.message === "No label for missing" + ); + await assert.rejects( + () => jsManager.loadProcessorLabel("invalid"), + (error) => error instanceof Error && error.message === "Invalid key thrown synchronously" + ); + const [firstLabel, secondLabel] = await Promise.all([ + jsManager.loadProcessorLabel("first"), + jsManager.loadProcessorLabel("second"), + ]); + assert.equal(firstLabel, "async:first"); + assert.equal(secondLabel, "async:second"); + + assert.equal(await jsManager.fetchProcessorCount(), 3); + await jsManager.resetProcessor(); + assert.equal(await jsManager.fetchProcessorCount(), 0); + + shouldRejectReset = true; + jsManager.incrementByAmount(2); + await assert.rejects( + () => jsManager.resetProcessor(), + (error) => error instanceof Error && error.message === "Reset rejected" + ); + assert.equal(await jsManager.fetchProcessorCount(), 2); + + jsManager.release(); + jsProcessor.helper.release(); + + const swiftProcessor = new exports.SwiftDataProcessor(); + const swiftManager = new exports.DataProcessorManager(swiftProcessor); + + swiftManager.setProcessorLabel("Swift", "Label"); + swiftManager.incrementByAmount(4); + assert.equal(await swiftManager.loadProcessorLabel("key"), "SwiftLabel:key"); + assert.equal(await swiftManager.fetchProcessorCount(), 4); + await swiftManager.resetProcessor(); + assert.equal(await swiftManager.fetchProcessorCount(), 0); + + swiftManager.release(); + swiftProcessor.release(); +} + /** @param {import('./../.build/plugins/PackageToJS/outputs/PackageTests/bridge-js.d.ts').Exports} exports */ function testProtocolSupport(exports) { let processorValue = 0; @@ -1328,7 +1459,16 @@ function testProtocolSupport(exports) { }, createOptionalGreeter() { return new exports.Greeter("JSOptionalGreeter"); }, handleAPIResult(result) { lastAPIResult = result; }, - getAPIResult() { return lastAPIResult; } + getAPIResult() { return lastAPIResult; }, + validate(value) { + if (value < 0) { + throw new Error("JSProcessor rejects negative values"); + } + return value * 2; + }, + async loadLabel(key) { return `${processorLabel}:${key}`; }, + async reset() { processorValue = 0; }, + async fetchCount() { return processorValue; } }; const successResult = { tag: exports.Utilities.Result.Tag.Success, param0: "Operation completed" }; @@ -1432,6 +1572,13 @@ function testProtocolSupport(exports) { jsProcessor.optionalCount = null; assert.equal(jsProcessor.optionalCount, null); + assert.equal(jsManager.validateProcessorValue(21), 42); + assert.throws( + () => jsManager.validateProcessorValue(-1), + (error) => error instanceof Error && error.message === "JSProcessor rejects negative values" + ); + assert.equal(jsManager.validateProcessorValue(5), 10); + newHelper.release(); optHelper.release(); jsManager.release(); @@ -1485,6 +1632,9 @@ function testProtocolSupport(exports) { swiftManager.setProcessorAPIResult(successResult); assert.deepEqual(swiftProcessor.getAPIResult(), successResult); + assert.equal(swiftManager.validateProcessorValue(7), 7); + assert.throws(() => swiftManager.validateProcessorValue(-1), /SwiftDataProcessor rejects negative values/); + swiftManager.release(); swiftProcessor.release(); @@ -1510,7 +1660,11 @@ function testProtocolSupport(exports) { processOptionalGreeter(greeter) { return ""; }, createOptionalGreeter() { return null; }, handleAPIResult(result) { }, - getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + async loadLabel(key) { return ""; }, + async reset() { }, + async fetchCount() { return 0; } }; let mainValue = 0; @@ -1535,7 +1689,11 @@ function testProtocolSupport(exports) { processOptionalGreeter(greeter) { return ""; }, createOptionalGreeter() { return null; }, handleAPIResult(result) { }, - getAPIResult() { return { tag: exports.APIResult.Tag.Info }; } + getAPIResult() { return { tag: exports.APIResult.Tag.Info }; }, + validate(value) { return value; }, + async loadLabel(key) { return ""; }, + async reset() { }, + async fetchCount() { return 0; } }; const managerWithOptional = new exports.DataProcessorManager(mainProcessor); diff --git a/package-lock.json b/package-lock.json index ea24d1645..7dd81a320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "rollup-plugin-dts": "^6.2.1", "tslib": "^2.8.1", "typescript": "^5.8.2", + "uwasi": "1.5.2", "vitest": "^4.0.18" } }, @@ -1581,6 +1582,13 @@ "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true }, + "node_modules/uwasi": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/uwasi/-/uwasi-1.5.2.tgz", + "integrity": "sha512-gglUvZ3Q5ye1DXUiSF7jnKT8dYqOzOpanIqT7Jd3brJ23V91JnvzK43F+f4SfHBA+IrhLXgfBWWF393Hp7xYFw==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/vite": { "version": "7.3.2", "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", diff --git a/package.json b/package.json index 866b2bb6f..4e4fdd7bb 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "rollup-plugin-dts": "^6.2.1", "tslib": "^2.8.1", "typescript": "^5.8.2", + "uwasi": "1.5.2", "vitest": "^4.0.18" } }