remove JAVASCRIPTKIT_WITHOUT_BIGINTS

Author: j-f1

.github/workflows/compatibility.yml

@@ -23,5 +23,3 @@ jobs:
           cd Example/JavaScriptKitExample
           swift build --triple wasm32-unknown-wasi
           swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS
-          swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_BIGINTS
-          swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS -Xswiftc -DJAVASCRIPTKIT_WITHOUT_BIGINTS

README.md

@@ -149,7 +149,7 @@ JavaScript features should work, which currently includes:
 - Mobile Safari 14.8+
 
 If you need to support older browser versions, you'll have to build with
-`JAVASCRIPTKIT_WITHOUT_WEAKREFS` and `JAVASCRIPTKIT_WITHOUT_BIGINTS` flags, passing `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS -Xswiftc -DJAVASCRIPTKIT_WITHOUT_BIGINTS` flags
+the `JAVASCRIPTKIT_WITHOUT_WEAKREFS` flag, passing `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS` flags
 when compiling. This should lower browser requirements to these versions:
 
 - Edge 16+

Runtime/src/index.ts

@@ -35,17 +35,6 @@ export class SwiftRuntime {
                 }`
             );
         }
-
-        if (this.exports.swjs_library_features() & LibraryFeatures.BigInts) {
-            if (typeof BigInt === "undefined") {
-                throw new Error(
-                    "The Swift part of JavaScriptKit was configured to require " +
-                        "the availability of JavaScript BigInts. Please build " +
-                        "with `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_BIGINTS` to " +
-                        "disable features that use BigInts."
-                );
-            }
-        }
     }
 
     private get instance() {

Sources/JavaScriptKit/ConstructibleFromJSValue.swift

@@ -35,18 +35,12 @@ extension Double: ConstructibleFromJSValue {}
 extension Float: ConstructibleFromJSValue {}
 
 extension SignedInteger where Self: ConstructibleFromJSValue {
-#if JAVASCRIPTKIT_WITHOUT_BIGINTS
-    public static func construct(from value: JSValue) -> Self? {
-        value.number.map(Self.init)
-    }
-#else
     public init(_ bigInt: JSBigInt) {
         self.init(bigInt.int64Value)
     }
     public static func construct(from value: JSValue) -> Self? {
         value.bigInt.map(Self.init) ?? value.number.map(Self.init)
     }
-#endif
 }
 extension Int: ConstructibleFromJSValue {}
 extension Int8: ConstructibleFromJSValue {}
@@ -55,18 +49,12 @@ extension Int32: ConstructibleFromJSValue {}
 extension Int64: ConstructibleFromJSValue {}
 
 extension UnsignedInteger where Self: ConstructibleFromJSValue {
-#if JAVASCRIPTKIT_WITHOUT_BIGINTS
-    public static func construct(from value: JSValue) -> Self? {
-        value.number.map(Self.init)
-    }
-#else
     public init(_ bigInt: JSBigInt) {
         self.init(bigInt.uInt64Value)
     }
     public static func construct(from value: JSValue) -> Self? {
         value.bigInt.map(Self.init) ?? value.number.map(Self.init)
     }
-#endif
 }
 extension UInt: ConstructibleFromJSValue {}
 extension UInt8: ConstructibleFromJSValue {}

Sources/JavaScriptKit/ConvertibleToJSValue.swift

@@ -218,11 +218,7 @@ extension RawJSValue: ConvertibleToJSValue {
         case .symbol:
             return .symbol(JSSymbol(id: UInt32(payload1)))
         case .bigInt:
-#if JAVASCRIPTKIT_WITHOUT_BIGINTS
-            fatalError("Received unsupported BigInt value")
-#else
             return .bigInt(JSBigInt(id: UInt32(payload1)))
-#endif
         }
     }
 }
@@ -257,11 +253,9 @@ extension JSValue {
         case let .symbol(symbolRef):
             kind = .symbol
             payload1 = JavaScriptPayload1(symbolRef.id)
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
         case let .bigInt(bigIntRef):
             kind = .bigInt
             payload1 = JavaScriptPayload1(bigIntRef.id)
-#endif
         }
         let rawValue = RawJSValue(kind: kind, payload1: payload1, payload2: payload2)
         return body(rawValue)

Sources/JavaScriptKit/Features.swift

@@ -1,16 +1,12 @@
 enum LibraryFeatures {
     static let weakRefs: Int32 = 1 << 0
-    static let bigInts: Int32 = 1 << 1
 }
 
 @_cdecl("_library_features")
 func _library_features() -> Int32 {
     var features: Int32 = 0
 #if !JAVASCRIPTKIT_WITHOUT_WEAKREFS
     features |= LibraryFeatures.weakRefs
-#endif
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-    features |= LibraryFeatures.bigInts
 #endif
     return features
 }

Sources/JavaScriptKit/FundamentalObjects/JSBigInt.swift

@@ -1,24 +1,25 @@
 import _CJavaScriptKit
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
 private let constructor = JSObject.global.BigInt.function!
 
 public final class JSBigInt: JSObject {
     public var int64Value: Int64 {
         _bigint_to_i64(id, true)
     }
+
     public var uInt64Value: UInt64 {
         UInt64(bitPattern: _bigint_to_i64(id, false))
     }
 
     public convenience init(_ value: Int64) {
         self.init(id: _i64_to_bigint(value, true))
     }
+
     public convenience init(unsigned value: UInt64) {
         self.init(id: _i64_to_bigint(Int64(bitPattern: value), false))
     }
 
-    public override init(id: JavaScriptObjectRef) {
+    override public init(id: JavaScriptObjectRef) {
         super.init(id: id)
     }
 
@@ -38,4 +39,3 @@ public final class JSBigInt: JSObject {
         }
     }
 }
-#endif

Sources/JavaScriptKit/JSValue.swift

@@ -11,9 +11,7 @@ public enum JSValue: Equatable {
     case undefined
     case function(JSFunction)
     case symbol(JSSymbol)
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
     case bigInt(JSBigInt)
-#endif
 
     /// Returns the `Bool` value of this JS value if its type is boolean.
     /// If not, returns `nil`.
@@ -80,7 +78,6 @@ public enum JSValue: Equatable {
         }
     }
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
     /// Returns the `JSBigInt` of this JS value if its type is function.
     /// If not, returns `nil`.
     public var bigInt: JSBigInt? {
@@ -89,7 +86,6 @@ public enum JSValue: Equatable {
         default: return nil
         }
     }
-#endif
 
     /// Returns the `true` if this JS value is null.
     /// If not, returns `false`.
@@ -249,12 +245,8 @@ public extension JSValue {
     /// - Returns: The result of `instanceof` in the JavaScript environment.
     func isInstanceOf(_ constructor: JSFunction) -> Bool {
         switch self {
-        case .boolean, .string, .number, .null, .undefined, .symbol:
+        case .boolean, .string, .number, .null, .undefined, .symbol, .bigInt:
             return false
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-        case .bigInt:
-            return false
-#endif
         case let .object(ref):
             return ref.isInstanceOf(constructor)
         case let .function(ref):
@@ -273,12 +265,8 @@ extension JSValue: CustomStringConvertible {
         case let .number(number):
             return number.description
         case let .object(object), let .function(object as JSObject),
-            let .symbol(object as JSObject):
-            return object.toString!().fromJSValue()!
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-        case let .bigInt(object as JSObject):
+            let .symbol(object as JSObject), let .bigInt(object as JSObject):
             return object.toString!().fromJSValue()!
-#endif
         case .null:
             return "null"
         case .undefined: