Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(WebAssembly): Make WebAssembly.Global generic #963

Merged
merged 4 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions baselines/audioworklet.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1193,16 +1193,16 @@ declare namespace WebAssembly {
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) */
interface Global {
interface Global<T extends ValueType = ValueType> {
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/value) */
value: any;
value: ValueTypeMap[T];
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/valueOf) */
valueOf(): any;
valueOf(): ValueTypeMap[T];
}

var Global: {
prototype: Global;
new(descriptor: GlobalDescriptor, v?: any): Global;
new<T extends ValueType = ValueType>(descriptor: GlobalDescriptor<T>, v?: ValueTypeMap[T]): Global<T>;
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) */
Expand Down Expand Up @@ -1279,9 +1279,9 @@ declare namespace WebAssembly {
new(descriptor: TableDescriptor, value?: any): Table;
};

interface GlobalDescriptor {
interface GlobalDescriptor<T extends ValueType = ValueType> {
mutable?: boolean;
value: ValueType;
value: T;
}

interface MemoryDescriptor {
Expand All @@ -1307,19 +1307,29 @@ declare namespace WebAssembly {
maximum?: number;
}

interface ValueTypeMap {
anyfunc: Function;
externref: any;
f32: number;
f64: number;
i32: number;
i64: bigint;
v128: never;
}

interface WebAssemblyInstantiatedSource {
instance: Instance;
module: Module;
}

type ImportExportKind = "function" | "global" | "memory" | "table";
type TableKind = "anyfunc" | "externref";
type ValueType = "anyfunc" | "externref" | "f32" | "f64" | "i32" | "i64" | "v128";
type ExportValue = Function | Global | Memory | Table;
type Exports = Record<string, ExportValue>;
type ImportValue = ExportValue | number;
type Imports = Record<string, ModuleImports>;
type ModuleImports = Record<string, ImportValue>;
type ValueType = keyof ValueTypeMap;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile) */
function compile(bytes: BufferSource): Promise<Module>;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiate) */
Expand Down
24 changes: 17 additions & 7 deletions baselines/dom.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26382,16 +26382,16 @@ declare namespace WebAssembly {
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) */
interface Global {
interface Global<T extends ValueType = ValueType> {
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/value) */
value: any;
value: ValueTypeMap[T];
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/valueOf) */
valueOf(): any;
valueOf(): ValueTypeMap[T];
}

var Global: {
prototype: Global;
new(descriptor: GlobalDescriptor, v?: any): Global;
new<T extends ValueType = ValueType>(descriptor: GlobalDescriptor<T>, v?: ValueTypeMap[T]): Global<T>;
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) */
Expand Down Expand Up @@ -26468,9 +26468,9 @@ declare namespace WebAssembly {
new(descriptor: TableDescriptor, value?: any): Table;
};

interface GlobalDescriptor {
interface GlobalDescriptor<T extends ValueType = ValueType> {
mutable?: boolean;
value: ValueType;
value: T;
}

interface MemoryDescriptor {
Expand All @@ -26496,19 +26496,29 @@ declare namespace WebAssembly {
maximum?: number;
}

interface ValueTypeMap {
anyfunc: Function;
externref: any;
f32: number;
f64: number;
i32: number;
i64: bigint;
v128: never;
}

interface WebAssemblyInstantiatedSource {
instance: Instance;
module: Module;
}

type ImportExportKind = "function" | "global" | "memory" | "table";
type TableKind = "anyfunc" | "externref";
type ValueType = "anyfunc" | "externref" | "f32" | "f64" | "i32" | "i64" | "v128";
type ExportValue = Function | Global | Memory | Table;
type Exports = Record<string, ExportValue>;
type ImportValue = ExportValue | number;
type Imports = Record<string, ModuleImports>;
type ModuleImports = Record<string, ImportValue>;
type ValueType = keyof ValueTypeMap;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile) */
function compile(bytes: BufferSource): Promise<Module>;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming) */
Expand Down
24 changes: 17 additions & 7 deletions baselines/serviceworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8035,16 +8035,16 @@ declare namespace WebAssembly {
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) */
interface Global {
interface Global<T extends ValueType = ValueType> {
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/value) */
value: any;
value: ValueTypeMap[T];
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/valueOf) */
valueOf(): any;
valueOf(): ValueTypeMap[T];
}

var Global: {
prototype: Global;
new(descriptor: GlobalDescriptor, v?: any): Global;
new<T extends ValueType = ValueType>(descriptor: GlobalDescriptor<T>, v?: ValueTypeMap[T]): Global<T>;
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) */
Expand Down Expand Up @@ -8121,9 +8121,9 @@ declare namespace WebAssembly {
new(descriptor: TableDescriptor, value?: any): Table;
};

interface GlobalDescriptor {
interface GlobalDescriptor<T extends ValueType = ValueType> {
mutable?: boolean;
value: ValueType;
value: T;
}

interface MemoryDescriptor {
Expand All @@ -8149,19 +8149,29 @@ declare namespace WebAssembly {
maximum?: number;
}

interface ValueTypeMap {
anyfunc: Function;
externref: any;
f32: number;
f64: number;
i32: number;
i64: bigint;
v128: never;
}

interface WebAssemblyInstantiatedSource {
instance: Instance;
module: Module;
}

type ImportExportKind = "function" | "global" | "memory" | "table";
type TableKind = "anyfunc" | "externref";
type ValueType = "anyfunc" | "externref" | "f32" | "f64" | "i32" | "i64" | "v128";
type ExportValue = Function | Global | Memory | Table;
type Exports = Record<string, ExportValue>;
type ImportValue = ExportValue | number;
type Imports = Record<string, ModuleImports>;
type ModuleImports = Record<string, ImportValue>;
type ValueType = keyof ValueTypeMap;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile) */
function compile(bytes: BufferSource): Promise<Module>;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming) */
Expand Down
24 changes: 17 additions & 7 deletions baselines/sharedworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8055,16 +8055,16 @@ declare namespace WebAssembly {
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) */
interface Global {
interface Global<T extends ValueType = ValueType> {
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/value) */
value: any;
value: ValueTypeMap[T];
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/valueOf) */
valueOf(): any;
valueOf(): ValueTypeMap[T];
}

var Global: {
prototype: Global;
new(descriptor: GlobalDescriptor, v?: any): Global;
new<T extends ValueType = ValueType>(descriptor: GlobalDescriptor<T>, v?: ValueTypeMap[T]): Global<T>;
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) */
Expand Down Expand Up @@ -8141,9 +8141,9 @@ declare namespace WebAssembly {
new(descriptor: TableDescriptor, value?: any): Table;
};

interface GlobalDescriptor {
interface GlobalDescriptor<T extends ValueType = ValueType> {
mutable?: boolean;
value: ValueType;
value: T;
}

interface MemoryDescriptor {
Expand All @@ -8169,19 +8169,29 @@ declare namespace WebAssembly {
maximum?: number;
}

interface ValueTypeMap {
anyfunc: Function;
externref: any;
f32: number;
f64: number;
i32: number;
i64: bigint;
v128: never;
}

interface WebAssemblyInstantiatedSource {
instance: Instance;
module: Module;
}

type ImportExportKind = "function" | "global" | "memory" | "table";
type TableKind = "anyfunc" | "externref";
type ValueType = "anyfunc" | "externref" | "f32" | "f64" | "i32" | "i64" | "v128";
type ExportValue = Function | Global | Memory | Table;
type Exports = Record<string, ExportValue>;
type ImportValue = ExportValue | number;
type Imports = Record<string, ModuleImports>;
type ModuleImports = Record<string, ImportValue>;
type ValueType = keyof ValueTypeMap;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile) */
function compile(bytes: BufferSource): Promise<Module>;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming) */
Expand Down
24 changes: 17 additions & 7 deletions baselines/webworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8701,16 +8701,16 @@ declare namespace WebAssembly {
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global) */
interface Global {
interface Global<T extends ValueType = ValueType> {
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/value) */
value: any;
value: ValueTypeMap[T];
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Global/valueOf) */
valueOf(): any;
valueOf(): ValueTypeMap[T];
}

var Global: {
prototype: Global;
new(descriptor: GlobalDescriptor, v?: any): Global;
new<T extends ValueType = ValueType>(descriptor: GlobalDescriptor<T>, v?: ValueTypeMap[T]): Global<T>;
};

/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance) */
Expand Down Expand Up @@ -8787,9 +8787,9 @@ declare namespace WebAssembly {
new(descriptor: TableDescriptor, value?: any): Table;
};

interface GlobalDescriptor {
interface GlobalDescriptor<T extends ValueType = ValueType> {
mutable?: boolean;
value: ValueType;
value: T;
}

interface MemoryDescriptor {
Expand All @@ -8815,19 +8815,29 @@ declare namespace WebAssembly {
maximum?: number;
}

interface ValueTypeMap {
anyfunc: Function;
externref: any;
f32: number;
f64: number;
i32: number;
i64: bigint;
v128: never;
}

interface WebAssemblyInstantiatedSource {
instance: Instance;
module: Module;
}

type ImportExportKind = "function" | "global" | "memory" | "table";
type TableKind = "anyfunc" | "externref";
type ValueType = "anyfunc" | "externref" | "f32" | "f64" | "i32" | "i64" | "v128";
type ExportValue = Function | Global | Memory | Table;
type Exports = Record<string, ExportValue>;
type ImportValue = ExportValue | number;
type Imports = Record<string, ModuleImports>;
type ModuleImports = Record<string, ImportValue>;
type ValueType = keyof ValueTypeMap;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compile) */
function compile(bytes: BufferSource): Promise<Module>;
/** [MDN Reference](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/compileStreaming) */
Expand Down
49 changes: 49 additions & 0 deletions inputfiles/addedTypes.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,50 @@
}
}
}
},
"ValueTypeMap": {
"name": "ValueTypeMap",
"legacyNamespace": "WebAssembly",
"exposed":"Window Worker Worklet",
"members": {
"member": {
"anyfunc": {
"name": "anyfunc",
"overrideType": "Function",
"required": 1
},
"externref": {
"name": "externref",
"overrideType": "any",
"required": 1
},
"f32": {
"name": "f32",
"overrideType": "number",
"required": 1
},
"f64": {
"name": "f64",
"overrideType": "number",
"required": 1
},
"i32": {
"name": "i32",
"overrideType": "number",
"required": 1
},
"i64": {
"name": "i64",
"overrideType": "bigint",
"required": 1
},
"v128": {
"name": "v128",
"overrideType": "never",
"required": 1
}
}
}
}
}
},
Expand Down Expand Up @@ -1305,6 +1349,11 @@
"name": "WindowProxy",
"type": "Window"
},
{
"name": "ValueType",
"legacyNamespace": "WebAssembly",
"overrideType": "keyof ValueTypeMap"
},
{
"name": "ExportValue",
"legacyNamespace": "WebAssembly",
Expand Down
Loading