GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Add support for BigInts and BigInt-based TypedArrays (#184) · t089/JavaScriptKit@34bf9e1

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • .github/workflows
    • compatibility.yml
  • IntegrationTests
    • TestSuites
      • Package.swift
      • Sources/PrimaryTests
        • I64.swift
        • main.swift
    • bin
      • concurrency-tests.js
      • primary-tests.js
  • Package.swift
  • README.md
  • Runtime
    • src
      • index.ts
      • js-value.ts
      • memory.ts
      • types.ts
    • tsconfig.json
  • Sources
    • JavaScriptBigIntSupport
      • Int64+I64.swift
      • JSBigInt+I64.swift
      • XcodeSupport.swift
    • JavaScriptEventLoop
      • JavaScriptEventLoop.swift
    • JavaScriptKit
      • BasicObjects
        • JSTypedArray.swift
      • ConstructibleFromJSValue.swift
      • ConvertibleToJSValue.swift
      • FundamentalObjects
        • JSBigInt.swift
        • JSObject.swift
        • JSSymbol.swift
      • JSValue.swift
      • XcodeSupport.swift
    • _CJavaScriptBigIntSupport
      • _CJavaScriptKit+I64.c
      • include
        • _CJavaScriptKit+I64.h
        • module.modulemap
    • _CJavaScriptKit
      • _CJavaScriptKit.c
      • include
        • _CJavaScriptKit.h
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/workflows/compatibility.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/compatibility.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ jobs:
2222
make bootstrap
2323
cd Example/JavaScriptKitExample
2424
swift build --triple wasm32-unknown-wasi
25+
swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS
Collapse file

‎IntegrationTests/TestSuites/Package.swift‎

Copy file name to clipboardExpand all lines: IntegrationTests/TestSuites/Package.swift
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
// This package doesn't work on macOS host, but should be able to be built for it
99
// for developing on Xcode. This minimum version requirement is to prevent availability
1010
// errors for Concurrency API, whose runtime support is shipped from macOS 12.0
11-
.macOS("12.0")
11+
.macOS("12.0"),
1212
],
1313
products: [
1414
.executable(
@@ -25,6 +25,7 @@ let package = Package(
2525
targets: [
2626
.target(name: "CHelpers"),
2727
.target(name: "PrimaryTests", dependencies: [
28+
.product(name: "JavaScriptBigIntSupport", package: "JavaScriptKit"),
2829
"JavaScriptKit",
2930
"CHelpers",
3031
]),
Collapse file

‎IntegrationTests/TestSuites/Sources/PrimaryTests/I64.swift‎

Copy file name to clipboard
+35Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import JavaScriptBigIntSupport
2+
import JavaScriptKit
3+
4+
func testI64() throws {
5+
try test("BigInt") {
6+
func expectPassesThrough(signed value: Int64) throws {
7+
let bigInt = JSBigInt(value)
8+
try expectEqual(bigInt.description, value.description)
9+
}
10+
11+
func expectPassesThrough(unsigned value: UInt64) throws {
12+
let bigInt = JSBigInt(unsigned: value)
13+
try expectEqual(bigInt.description, value.description)
14+
}
15+
16+
try expectPassesThrough(signed: 0)
17+
try expectPassesThrough(signed: 1 << 62)
18+
try expectPassesThrough(signed: -2305)
19+
for _ in 0 ..< 100 {
20+
try expectPassesThrough(signed: .random(in: .min ... .max))
21+
}
22+
try expectPassesThrough(signed: .min)
23+
try expectPassesThrough(signed: .max)
24+
25+
try expectPassesThrough(unsigned: 0)
26+
try expectPassesThrough(unsigned: 1 << 62)
27+
try expectPassesThrough(unsigned: 1 << 63)
28+
try expectPassesThrough(unsigned: .min)
29+
try expectPassesThrough(unsigned: .max)
30+
try expectPassesThrough(unsigned: ~0)
31+
for _ in 0 ..< 100 {
32+
try expectPassesThrough(unsigned: .random(in: .min ... .max))
33+
}
34+
}
35+
}
Collapse file

‎IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift‎

Copy file name to clipboardExpand all lines: IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,5 +852,5 @@ try test("JSValueDecoder") {
852852
try expectEqual(decodedTama.isCat, true)
853853
}
854854

855-
855+
try testI64()
856856
Expectation.wait(expectations)
Collapse file

‎IntegrationTests/bin/concurrency-tests.js‎

Copy file name to clipboardExpand all lines: IntegrationTests/bin/concurrency-tests.js
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const { startWasiTask } = require("../lib");
22

3+
Error.stackTraceLimit = Infinity;
4+
35
startWasiTask("./dist/ConcurrencyTests.wasm").catch((err) => {
46
console.log(err);
57
process.exit(1);
Collapse file

‎IntegrationTests/bin/primary-tests.js‎

Copy file name to clipboardExpand all lines: IntegrationTests/bin/primary-tests.js
+20-15Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Error.stackTraceLimit = Infinity;
2+
13
global.globalObject1 = {
24
prop_1: {
35
nested_prop: 1,
@@ -44,23 +46,26 @@ global.globalObject1 = {
4446
throw "String Error";
4547
},
4648
func3: function () {
47-
throw 3.0
49+
throw 3.0;
4850
},
4951
},
5052
eval_closure: function (fn) {
51-
return fn(arguments[1])
53+
return fn(arguments[1]);
5254
},
5355
observable_obj: {
5456
set_called: false,
55-
target: new Proxy({
56-
nested: {}
57-
}, {
58-
set(target, key, value) {
59-
global.globalObject1.observable_obj.set_called = true;
60-
target[key] = value;
61-
return true;
57+
target: new Proxy(
58+
{
59+
nested: {},
60+
},
61+
{
62+
set(target, key, value) {
63+
global.globalObject1.observable_obj.set_called = true;
64+
target[key] = value;
65+
return true;
66+
},
6267
}
63-
})
68+
),
6469
},
6570
};
6671

@@ -79,16 +84,16 @@ global.Animal = function (name, age, isCat) {
7984
};
8085
this.setName = function (name) {
8186
this.name = name;
82-
}
87+
};
8388
};
8489

85-
global.callThrowingClosure = (c) => {
90+
global.callThrowingClosure = (c) => {
8691
try {
87-
c()
92+
c();
8893
} catch (error) {
89-
return error
94+
return error;
9095
}
91-
}
96+
};
9297

9398
const { startWasiTask } = require("../lib");
9499

Collapse file

‎Package.swift‎

Copy file name to clipboardExpand all lines: Package.swift
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ let package = Package(
77
products: [
88
.library(name: "JavaScriptKit", targets: ["JavaScriptKit"]),
99
.library(name: "JavaScriptEventLoop", targets: ["JavaScriptEventLoop"]),
10+
.library(name: "JavaScriptBigIntSupport", targets: ["JavaScriptBigIntSupport"]),
1011
],
1112
targets: [
1213
.target(
1314
name: "JavaScriptKit",
1415
dependencies: ["_CJavaScriptKit"]
1516
),
1617
.target(name: "_CJavaScriptKit"),
18+
.target(
19+
name: "JavaScriptBigIntSupport",
20+
dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"]
21+
),
22+
.target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
1723
.target(
1824
name: "JavaScriptEventLoop",
1925
dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"]
Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ JavaScript features should work, which currently includes:
149149
- Mobile Safari 14.8+
150150

151151
If you need to support older browser versions, you'll have to build with
152-
`JAVASCRIPTKIT_WITHOUT_WEAKREFS` flag, passing `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS` flags
152+
the `JAVASCRIPTKIT_WITHOUT_WEAKREFS` flag, passing `-Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS` flags
153153
when compiling. This should lower browser requirements to these versions:
154154

155155
- Edge 16+
Collapse file

‎Runtime/src/index.ts‎

Copy file name to clipboardExpand all lines: Runtime/src/index.ts
+22-7Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class SwiftRuntime {
1414
private _instance: WebAssembly.Instance | null;
1515
private _memory: Memory | null;
1616
private _closureDeallocator: SwiftClosureDeallocator | null;
17-
private version: number = 706;
17+
private version: number = 707;
1818

1919
private textDecoder = new TextDecoder("utf-8");
2020
private textEncoder = new TextEncoder(); // Only support utf-8
@@ -114,7 +114,6 @@ export class SwiftRuntime {
114114
const value = JSValue.decode(kind, payload1, payload2, this.memory);
115115
obj[key] = value;
116116
},
117-
118117
swjs_get_prop: (
119118
ref: ref,
120119
name: ref,
@@ -146,7 +145,6 @@ export class SwiftRuntime {
146145
const value = JSValue.decode(kind, payload1, payload2, this.memory);
147146
obj[index] = value;
148147
},
149-
150148
swjs_get_subscript: (
151149
ref: ref,
152150
index: number,
@@ -172,15 +170,13 @@ export class SwiftRuntime {
172170
this.memory.writeUint32(bytes_ptr_result, bytes_ptr);
173171
return bytes.length;
174172
},
175-
176173
swjs_decode_string: (bytes_ptr: pointer, length: number) => {
177174
const bytes = this.memory
178175
.bytes()
179176
.subarray(bytes_ptr, bytes_ptr + length);
180177
const string = this.textDecoder.decode(bytes);
181178
return this.memory.retain(string);
182179
},
183-
184180
swjs_load_string: (ref: ref, buffer: pointer) => {
185181
const bytes = this.memory.getObject(ref);
186182
this.memory.writeBytes(buffer, bytes);
@@ -290,7 +286,6 @@ export class SwiftRuntime {
290286
this.memory
291287
);
292288
},
293-
294289
swjs_call_function_with_this_no_catch: (
295290
obj_ref: ref,
296291
func_ref: ref,
@@ -328,13 +323,13 @@ export class SwiftRuntime {
328323
}
329324
}
330325
},
326+
331327
swjs_call_new: (ref: ref, argv: pointer, argc: number) => {
332328
const constructor = this.memory.getObject(ref);
333329
const args = JSValue.decodeArray(argv, argc, this.memory);
334330
const instance = new constructor(...args);
335331
return this.memory.retain(instance);
336332
},
337-
338333
swjs_call_throwing_new: (
339334
ref: ref,
340335
argv: pointer,
@@ -409,5 +404,25 @@ export class SwiftRuntime {
409404
swjs_release: (ref: ref) => {
410405
this.memory.release(ref);
411406
},
407+
408+
swjs_i64_to_bigint: (value: bigint, signed: number) => {
409+
return this.memory.retain(
410+
signed ? value : BigInt.asUintN(64, value)
411+
);
412+
},
413+
swjs_bigint_to_i64: (ref: ref, signed: number) => {
414+
const object = this.memory.getObject(ref);
415+
if (typeof object !== "bigint") {
416+
throw new Error(`Expected a BigInt, but got ${typeof object}`);
417+
}
418+
if (signed) {
419+
return object;
420+
} else {
421+
if (object < BigInt(0)) {
422+
return BigInt(0);
423+
}
424+
return BigInt.asIntN(64, object);
425+
}
426+
},
412427
};
413428
}
Collapse file

‎Runtime/src/js-value.ts‎

Copy file name to clipboardExpand all lines: Runtime/src/js-value.ts
+23-14Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Memory } from "./memory";
2-
import { pointer } from "./types";
2+
import { assertNever, pointer } from "./types";
33

4-
export enum Kind {
5-
Invalid = -1,
4+
export const enum Kind {
65
Boolean = 0,
76
String = 1,
87
Number = 2,
@@ -11,6 +10,7 @@ export enum Kind {
1110
Undefined = 5,
1211
Function = 6,
1312
Symbol = 7,
13+
BigInt = 8,
1414
}
1515

1616
export const decode = (
@@ -33,6 +33,8 @@ export const decode = (
3333
case Kind.String:
3434
case Kind.Object:
3535
case Kind.Function:
36+
case Kind.Symbol:
37+
case Kind.BigInt:
3638
return memory.getObject(payload1);
3739

3840
case Kind.Null:
@@ -42,7 +44,7 @@ export const decode = (
4244
return undefined;
4345

4446
default:
45-
throw new Error(`JSValue Type kind "${kind}" is not supported`);
47+
assertNever(kind, `JSValue Type kind "${kind}" is not supported`);
4648
}
4749
};
4850

@@ -73,7 +75,14 @@ export const write = (
7375
memory.writeUint32(kind_ptr, exceptionBit | Kind.Null);
7476
return;
7577
}
76-
switch (typeof value) {
78+
79+
const writeRef = (kind: Kind) => {
80+
memory.writeUint32(kind_ptr, exceptionBit | kind);
81+
memory.writeUint32(payload1_ptr, memory.retain(value));
82+
};
83+
84+
const type = typeof value;
85+
switch (type) {
7786
case "boolean": {
7887
memory.writeUint32(kind_ptr, exceptionBit | Kind.Boolean);
7988
memory.writeUint32(payload1_ptr, value ? 1 : 0);
@@ -85,30 +94,30 @@ export const write = (
8594
break;
8695
}
8796
case "string": {
88-
memory.writeUint32(kind_ptr, exceptionBit | Kind.String);
89-
memory.writeUint32(payload1_ptr, memory.retain(value));
97+
writeRef(Kind.String);
9098
break;
9199
}
92100
case "undefined": {
93101
memory.writeUint32(kind_ptr, exceptionBit | Kind.Undefined);
94102
break;
95103
}
96104
case "object": {
97-
memory.writeUint32(kind_ptr, exceptionBit | Kind.Object);
98-
memory.writeUint32(payload1_ptr, memory.retain(value));
105+
writeRef(Kind.Object);
99106
break;
100107
}
101108
case "function": {
102-
memory.writeUint32(kind_ptr, exceptionBit | Kind.Function);
103-
memory.writeUint32(payload1_ptr, memory.retain(value));
109+
writeRef(Kind.Function);
104110
break;
105111
}
106112
case "symbol": {
107-
memory.writeUint32(kind_ptr, exceptionBit | Kind.Symbol);
108-
memory.writeUint32(payload1_ptr, memory.retain(value));
113+
writeRef(Kind.Symbol);
114+
break;
115+
}
116+
case "bigint": {
117+
writeRef(Kind.BigInt);
109118
break;
110119
}
111120
default:
112-
throw new Error(`Type "${typeof value}" is not supported yet`);
121+
assertNever(type, `Type "${type}" is not supported yet`);
113122
}
114123
};

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.