Move i64 stuff to a separate module

Author: j-f1

Package.swift

@@ -7,13 +7,19 @@ let package = Package(
     products: [
         .library(name: "JavaScriptKit", targets: ["JavaScriptKit"]),
         .library(name: "JavaScriptEventLoop", targets: ["JavaScriptEventLoop"]),
+        .library(name: "JavaScriptKit_I64", targets: ["JavaScriptKit_I64"]),
     ],
     targets: [
         .target(
             name: "JavaScriptKit",
             dependencies: ["_CJavaScriptKit"]
         ),
         .target(name: "_CJavaScriptKit"),
+        .target(
+            name: "JavaScriptKit_I64",
+            dependencies: ["_CJavaScriptKit_I64", "JavaScriptKit"]
+        ),
+        .target(name: "_CJavaScriptKit_I64", dependencies: ["_CJavaScriptKit"]),
         .target(
             name: "JavaScriptEventLoop",
             dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"]

Sources/JavaScriptKit/BasicObjects/JSTypedArray.swift

@@ -135,15 +135,6 @@ extension UInt32: TypedArrayElement {
     public static var typedArrayClass = JSObject.global.Uint32Array.function!
 }
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-extension Int64: TypedArrayElement {
-    public static var typedArrayClass = JSObject.global.BigInt64Array.function!
-}
-extension UInt64: TypedArrayElement {
-    public static var typedArrayClass = JSObject.global.BigUint64Array.function!
-}
-#endif
-
 extension Float32: TypedArrayElement {
     public static var typedArrayClass = JSObject.global.Float32Array.function!
 }

Sources/JavaScriptKit/ConvertibleToJSValue.swift

@@ -63,11 +63,6 @@ extension UInt32: ConvertibleToJSValue {
     public var jsValue: JSValue { .number(Double(self)) }
 }
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-extension UInt64: ConvertibleToJSValue {
-    public var jsValue: JSValue { .bigInt(JSBigInt(unsigned: self)) }
-}
-#endif
 
 extension Int8: ConvertibleToJSValue {
     public var jsValue: JSValue { .number(Double(self)) }
@@ -81,12 +76,6 @@ extension Int32: ConvertibleToJSValue {
     public var jsValue: JSValue { .number(Double(self)) }
 }
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-extension Int64: ConvertibleToJSValue {
-    public var jsValue: JSValue { .bigInt(JSBigInt(self)) }
-}
-#endif
-
 extension JSString: ConvertibleToJSValue {
     public var jsValue: JSValue { .string(self) }
 }

Sources/JavaScriptKit/FundamentalObjects/JSBigInt.swift

@@ -3,22 +3,6 @@ import _CJavaScriptKit
 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))
-    }
-
     @_spi(JSObject_id) override public init(id: JavaScriptObjectRef) {
         super.init(id: id)
     }

Sources/JavaScriptKit_I64/Int64+I64.swift

@@ -0,0 +1,13 @@
+import JavaScriptKit
+
+extension UInt64: ConvertibleToJSValue, TypedArrayElement {
+    public static var typedArrayClass = JSObject.global.BigUint64Array.function!
+
+    public var jsValue: JSValue { .bigInt(JSBigInt(unsigned: self)) }
+}
+
+extension Int64: ConvertibleToJSValue, TypedArrayElement {
+    public static var typedArrayClass = JSObject.global.BigInt64Array.function!
+
+    public var jsValue: JSValue { .bigInt(JSBigInt(self)) }
+}

Sources/JavaScriptKit_I64/JSBigInt+I64.swift

@@ -0,0 +1,20 @@
+@_spi(JSObject_id) import JavaScriptKit
+import _CJavaScriptKit_I64
+
+public extension JSBigInt {
+    var int64Value: Int64 {
+        _bigint_to_i64(id, true)
+    }
+
+    var uInt64Value: UInt64 {
+        UInt64(bitPattern: _bigint_to_i64(id, false))
+    }
+
+    convenience init(_ value: Int64) {
+        self.init(id: _i64_to_bigint(value, true))
+    }
+
+    convenience init(unsigned value: UInt64) {
+        self.init(id: _i64_to_bigint(Int64(bitPattern: value), false))
+    }
+}

Sources/_CJavaScriptKit/include/_CJavaScriptKit.h

@@ -301,24 +301,6 @@ __attribute__((__import_module__("javascript_kit"),
 extern void _release(const JavaScriptObjectRef ref);
 
 
-#if !JAVASCRIPTKIT_WITHOUT_BIGINTS
-/// Converts the provided Int64 or UInt64 to a BigInt.
-///
-/// @param value The value to convert.
-/// @param is_signed Whether to treat the value as a signed integer or not.
-__attribute__((__import_module__("javascript_kit"),
-               __import_name__("swjs_i64_to_bigint")))
-extern JavaScriptObjectRef _i64_to_bigint(const long long value, bool is_signed);
-
-/// Converts the provided BigInt to an Int64 or UInt64.
-///
-/// @param ref The target JavaScript object.
-/// @param is_signed Whether to treat the return value as a signed integer or not.
-__attribute__((__import_module__("javascript_kit"),
-               __import_name__("swjs_bigint_to_i64")))
-extern long long _bigint_to_i64(const JavaScriptObjectRef ref, bool is_signed);
-#endif
-
 #endif
 
 #endif /* _CJavaScriptKit_h */

Sources/_CJavaScriptKit_I64/_CJavaScriptKit+I64.c

@@ -0,0 +1 @@
+// empty file to appease build process

Sources/_CJavaScriptKit_I64/include/_CJavaScriptKit+I64.h

@@ -0,0 +1,23 @@
+
+#ifndef _CJavaScriptKit_I64_h
+#define _CJavaScriptKit_I64_h
+
+#include <_CJavaScriptKit.h>
+
+/// Converts the provided Int64 or UInt64 to a BigInt.
+///
+/// @param value The value to convert.
+/// @param is_signed Whether to treat the value as a signed integer or not.
+__attribute__((__import_module__("javascript_kit"),
+               __import_name__("swjs_i64_to_bigint")))
+extern JavaScriptObjectRef _i64_to_bigint(const long long value, bool is_signed);
+
+/// Converts the provided BigInt to an Int64 or UInt64.
+///
+/// @param ref The target JavaScript object.
+/// @param is_signed Whether to treat the return value as a signed integer or not.
+__attribute__((__import_module__("javascript_kit"),
+               __import_name__("swjs_bigint_to_i64")))
+extern long long _bigint_to_i64(const JavaScriptObjectRef ref, bool is_signed);
+
+#endif /* _CJavaScriptKit_I64_h */

Sources/_CJavaScriptKit_I64/include/module.modulemap

@@ -0,0 +1,4 @@
+module _CJavaScriptKit_I64 {
+    header "_CJavaScriptKit+I64.h"
+    export *
+}