Skip to content

Commit 9a6c4c1

Browse files
Make SwiftRuntime.memory constant property
1 parent cb86b61 commit 9a6c4c1

File tree

7 files changed

+236
-259
lines changed

7 files changed

+236
-259
lines changed

Plugins/PackageToJS/Templates/runtime.d.ts

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
type ref = number;
22
type pointer = number;
33

4-
declare class Memory {
5-
readonly rawMemory: WebAssembly.Memory;
6-
private readonly heap;
7-
constructor(exports: WebAssembly.Exports);
8-
retain: (value: any) => number;
9-
getObject: (ref: number) => any;
10-
release: (ref: number) => void;
11-
retainByRef: (ref: number) => number;
12-
bytes: () => Uint8Array<ArrayBuffer>;
13-
dataView: () => DataView<ArrayBuffer>;
14-
writeBytes: (ptr: pointer, bytes: Uint8Array) => void;
15-
readUint32: (ptr: pointer) => number;
16-
readUint64: (ptr: pointer) => bigint;
17-
readInt64: (ptr: pointer) => bigint;
18-
readFloat64: (ptr: pointer) => number;
19-
writeUint32: (ptr: pointer, value: number) => void;
20-
writeUint64: (ptr: pointer, value: bigint) => void;
21-
writeInt64: (ptr: pointer, value: bigint) => void;
22-
writeFloat64: (ptr: pointer, value: number) => void;
4+
declare class JSObjectSpace {
5+
private _heapValueById;
6+
private _heapEntryByValue;
7+
private _heapNextKey;
8+
constructor();
9+
retain(value: any): number;
10+
retainByRef(ref: ref): number;
11+
release(ref: ref): void;
12+
getObject(ref: ref): any;
2313
}
2414

2515
/**
@@ -96,7 +86,7 @@ type SwiftRuntimeThreadChannel = {
9686
};
9787
declare class ITCInterface {
9888
private memory;
99-
constructor(memory: Memory);
89+
constructor(memory: JSObjectSpace);
10090
send(sendingObject: ref, transferringObjects: ref[], sendingContext: pointer): {
10191
object: any;
10292
sendingContext: pointer;
@@ -182,14 +172,17 @@ type SwiftRuntimeOptions = {
182172
};
183173
declare class SwiftRuntime {
184174
private _instance;
185-
private _memory;
175+
private readonly memory;
186176
private _closureDeallocator;
187177
private options;
188178
private version;
189179
private textDecoder;
190180
private textEncoder;
191181
/** The thread ID of the current thread. */
192182
private tid;
183+
private getDataView;
184+
private getUint8Array;
185+
private wasmMemory;
193186
UnsafeEventLoopYield: typeof UnsafeEventLoopYield;
194187
constructor(options?: SwiftRuntimeOptions);
195188
setInstance(instance: WebAssembly.Instance): void;
@@ -202,7 +195,6 @@ declare class SwiftRuntime {
202195
startThread(tid: number, startArg: number): void;
203196
private get instance();
204197
private get exports();
205-
private get memory();
206198
private get closureDeallocator();
207199
private callHostFunction;
208200
/** @deprecated Use `wasmImports` instead */

0 commit comments

Comments
 (0)