Skip to content

Map WebIDL object to TypeScript object #751

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Map WebIDL object to TypeScript object #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59d905
Map WebIDL `object` to TypeScript `object`
RReverser Sep 5, 2019
e7a398b
Merge branch 'master' into replace-object-type
RReverser Sep 10, 2019
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
60 changes: 30 additions & 30 deletions baselines/dom.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ interface AudioWorkletNodeOptions extends AudioNodeOptions {
numberOfOutputs?: number;
outputChannelCount?: number[];
parameterData?: Record<string, number>;
processorOptions?: any;
processorOptions?: object | null;
}

interface AuthenticationExtensionsClientInputs {
Expand Down Expand Up @@ -948,7 +948,7 @@ interface PaymentDetailsInit extends PaymentDetailsBase {

interface PaymentDetailsModifier {
additionalDisplayItems?: PaymentItem[];
data?: any;
data?: object;
supportedMethods: string | string[];
total?: PaymentItem;
}
Expand All @@ -965,7 +965,7 @@ interface PaymentItem {
}

interface PaymentMethodData {
data?: any;
data?: object;
supportedMethods: string | string[];
}

Expand Down Expand Up @@ -1043,7 +1043,7 @@ interface PositionOptions {
}

interface PostMessageOptions {
transfer?: any[];
transfer?: object[];
}

interface ProgressEventInit extends EventInit {
Expand Down Expand Up @@ -2465,14 +2465,14 @@ interface BhxBrowser {
clearLastError(): void;
currentWindowId(): number;
fireExtensionApiTelemetry(functionName: string, isSucceeded: boolean, isSupported: boolean, errorString: string): void;
genericFunction(functionId: number, destination: any, parameters?: string, callbackId?: number): void;
genericFunction(functionId: number, destination: object, parameters?: string, callbackId?: number): void;
genericSynchronousFunction(functionId: number, parameters?: string): string;
getExtensionId(): string;
getThisAddress(): any;
getThisAddress(): object;
registerGenericFunctionCallbackHandler(callbackHandler: Function): void;
registerGenericListenerHandler(eventHandler: Function): void;
setLastError(parameters: string): void;
webPlatformGenericFunction(destination: any, parameters?: string, callbackId?: number): void;
webPlatformGenericFunction(destination: object, parameters?: string, callbackId?: number): void;
}

declare var BhxBrowser: {
Expand Down Expand Up @@ -3636,7 +3636,7 @@ interface ConcatParams extends Algorithm {

/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
interface Console {
memory: any;
memory: object;
assert(condition?: boolean, message?: string, ...data: any[]): void;
clear(): void;
count(label?: string): void;
Expand Down Expand Up @@ -3978,7 +3978,7 @@ interface DOMMatrixReadOnly {
skewY(sy?: number): DOMMatrix;
toFloat32Array(): Float32Array;
toFloat64Array(): Float64Array;
toJSON(): any;
toJSON(): object;
transformPoint(point?: DOMPointInit): DOMPoint;
translate(tx?: number, ty?: number, tz?: number): DOMMatrix;
}
Expand Down Expand Up @@ -4023,7 +4023,7 @@ interface DOMPointReadOnly {
readonly y: number;
readonly z: number;
matrixTransform(matrix?: DOMMatrixInit): DOMPoint;
toJSON(): any;
toJSON(): object;
}

declare var DOMPointReadOnly: {
Expand All @@ -4038,7 +4038,7 @@ interface DOMQuad {
readonly p3: DOMPoint;
readonly p4: DOMPoint;
getBounds(): DOMRect;
toJSON(): any;
toJSON(): object;
}

declare var DOMQuad: {
Expand Down Expand Up @@ -4084,7 +4084,7 @@ interface DOMRectReadOnly {
readonly width: number;
readonly x: number;
readonly y: number;
toJSON(): any;
toJSON(): object;
}

declare var DOMRectReadOnly: {
Expand Down Expand Up @@ -5483,13 +5483,13 @@ declare var EventTarget: {
interface ExtensionScriptApis {
extensionIdToShortId(extensionId: string): number;
fireExtensionApiTelemetry(functionName: string, isSucceeded: boolean, isSupported: boolean, errorString: string): void;
genericFunction(routerAddress: any, parameters?: string, callbackId?: number): void;
genericFunction(routerAddress: object, parameters?: string, callbackId?: number): void;
genericSynchronousFunction(functionId: number, parameters?: string): string;
genericWebRuntimeCallout(to: any, from: any, payload: string): void;
genericWebRuntimeCallout(to: object, from: object, payload: string): void;
getExtensionId(): string;
registerGenericFunctionCallbackHandler(callbackHandler: Function): void;
registerGenericPersistentCallbackHandler(callbackHandler: Function): void;
registerWebRuntimeCallbackHandler(handler: Function): any;
registerWebRuntimeCallbackHandler(handler: Function): object;
}

declare var ExtensionScriptApis: {
Expand Down Expand Up @@ -10185,7 +10185,7 @@ interface MediaDeviceInfo {
readonly groupId: string;
readonly kind: MediaDeviceKind;
readonly label: string;
toJSON(): any;
toJSON(): object;
}

declare var MediaDeviceInfo: {
Expand Down Expand Up @@ -11559,7 +11559,7 @@ declare var PaymentRequestUpdateEvent: {

/** This Payment Request API interface is returned after a user selects a payment method and approves a payment request. */
interface PaymentResponse {
readonly details: any;
readonly details: object;
readonly methodName: string;
readonly payerEmail: string | null;
readonly payerName: string | null;
Expand Down Expand Up @@ -11627,7 +11627,7 @@ interface Performance extends EventTarget {
measure(measureName: string, startMark?: string, endMark?: string): void;
now(): number;
setResourceTimingBufferSize(maxSize: number): void;
toJSON(): any;
toJSON(): object;
addEventListener<K extends keyof PerformanceEventMap>(type: K, listener: (this: Performance, ev: PerformanceEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof PerformanceEventMap>(type: K, listener: (this: Performance, ev: PerformanceEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
Expand All @@ -11645,7 +11645,7 @@ interface PerformanceEntry {
readonly entryType: string;
readonly name: string;
readonly startTime: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceEntry: {
Expand Down Expand Up @@ -11675,7 +11675,7 @@ declare var PerformanceMeasure: {
interface PerformanceNavigation {
readonly redirectCount: number;
readonly type: number;
toJSON(): any;
toJSON(): object;
readonly TYPE_BACK_FORWARD: number;
readonly TYPE_NAVIGATE: number;
readonly TYPE_RELOAD: number;
Expand Down Expand Up @@ -11703,7 +11703,7 @@ interface PerformanceNavigationTiming extends PerformanceResourceTiming {
readonly type: NavigationType;
readonly unloadEventEnd: number;
readonly unloadEventStart: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceNavigationTiming: {
Expand Down Expand Up @@ -11753,7 +11753,7 @@ interface PerformanceResourceTiming extends PerformanceEntry {
readonly secureConnectionStart: number;
readonly transferSize: number;
readonly workerStart: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceResourceTiming: {
Expand Down Expand Up @@ -11784,7 +11784,7 @@ interface PerformanceTiming {
readonly secureConnectionStart: number;
readonly unloadEventEnd: number;
readonly unloadEventStart: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceTiming: {
Expand Down Expand Up @@ -12476,7 +12476,7 @@ declare var RTCSctpTransport: {
interface RTCSessionDescription {
readonly sdp: string;
readonly type: RTCSdpType;
toJSON(): any;
toJSON(): object;
}

declare var RTCSessionDescription: {
Expand Down Expand Up @@ -12532,7 +12532,7 @@ declare var RTCStatsProvider: {
};

interface RTCStatsReport {
forEach(callbackfn: (value: any, key: string, parent: RTCStatsReport) => void, thisArg?: any): void;
forEach(callbackfn: (value: object, key: string, parent: RTCStatsReport) => void, thisArg?: any): void;
}

declare var RTCStatsReport: {
Expand Down Expand Up @@ -19043,12 +19043,12 @@ declare namespace WebAssembly {
};

interface Instance {
readonly exports: any;
readonly exports: object;
}

var Instance: {
prototype: Instance;
new(module: Module, importObject?: any): Instance;
new(module: Module, importObject?: object): Instance;
};

interface LinkError {
Expand Down Expand Up @@ -19136,9 +19136,9 @@ declare namespace WebAssembly {
type TableKind = "anyfunc";
function compile(bytes: BufferSource): Promise<Module>;
function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
function instantiate(bytes: BufferSource, importObject?: object): Promise<WebAssemblyInstantiatedSource>;
function instantiate(moduleObject: Module, importObject?: object): Promise<Instance>;
function instantiateStreaming(source: Response | Promise<Response>, importObject?: object): Promise<WebAssemblyInstantiatedSource>;
function validate(bytes: BufferSource): boolean;
}

Expand Down
2 changes: 1 addition & 1 deletion baselines/dom.iterable.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ interface RTCRtpTransceiver {
setCodecPreferences(codecs: Iterable<RTCRtpCodecCapability>): void;
}

interface RTCStatsReport extends ReadonlyMap<string, any> {
interface RTCStatsReport extends ReadonlyMap<string, object> {
}

interface SVGLengthList {
Expand Down
28 changes: 14 additions & 14 deletions baselines/webworker.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ interface PipeOptions {
}

interface PostMessageOptions {
transfer?: any[];
transfer?: object[];
}

interface ProgressEventInit extends EventInit {
Expand Down Expand Up @@ -906,7 +906,7 @@ interface ConcatParams extends Algorithm {

/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
interface Console {
memory: any;
memory: object;
assert(condition?: boolean, message?: string, ...data: any[]): void;
clear(): void;
count(label?: string): void;
Expand Down Expand Up @@ -1132,7 +1132,7 @@ interface DOMMatrixReadOnly {
skewY(sy?: number): DOMMatrix;
toFloat32Array(): Float32Array;
toFloat64Array(): Float64Array;
toJSON(): any;
toJSON(): object;
transformPoint(point?: DOMPointInit): DOMPoint;
translate(tx?: number, ty?: number, tz?: number): DOMMatrix;
}
Expand Down Expand Up @@ -1164,7 +1164,7 @@ interface DOMPointReadOnly {
readonly y: number;
readonly z: number;
matrixTransform(matrix?: DOMMatrixInit): DOMPoint;
toJSON(): any;
toJSON(): object;
}

declare var DOMPointReadOnly: {
Expand All @@ -1179,7 +1179,7 @@ interface DOMQuad {
readonly p3: DOMPoint;
readonly p4: DOMPoint;
getBounds(): DOMRect;
toJSON(): any;
toJSON(): object;
}

declare var DOMQuad: {
Expand Down Expand Up @@ -1211,7 +1211,7 @@ interface DOMRectReadOnly {
readonly width: number;
readonly x: number;
readonly y: number;
toJSON(): any;
toJSON(): object;
}

declare var DOMRectReadOnly: {
Expand Down Expand Up @@ -2493,7 +2493,7 @@ interface Performance extends EventTarget {
measure(measureName: string, startMark?: string, endMark?: string): void;
now(): number;
setResourceTimingBufferSize(maxSize: number): void;
toJSON(): any;
toJSON(): object;
addEventListener<K extends keyof PerformanceEventMap>(type: K, listener: (this: Performance, ev: PerformanceEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof PerformanceEventMap>(type: K, listener: (this: Performance, ev: PerformanceEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
Expand All @@ -2511,7 +2511,7 @@ interface PerformanceEntry {
readonly entryType: string;
readonly name: string;
readonly startTime: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceEntry: {
Expand Down Expand Up @@ -2579,7 +2579,7 @@ interface PerformanceResourceTiming extends PerformanceEntry {
readonly secureConnectionStart: number;
readonly transferSize: number;
readonly workerStart: number;
toJSON(): any;
toJSON(): object;
}

declare var PerformanceResourceTiming: {
Expand Down Expand Up @@ -5604,12 +5604,12 @@ declare namespace WebAssembly {
};

interface Instance {
readonly exports: any;
readonly exports: object;
}

var Instance: {
prototype: Instance;
new(module: Module, importObject?: any): Instance;
new(module: Module, importObject?: object): Instance;
};

interface Memory {
Expand Down Expand Up @@ -5681,9 +5681,9 @@ declare namespace WebAssembly {
type TableKind = "anyfunc";
function compile(bytes: BufferSource): Promise<Module>;
function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
function instantiate(bytes: BufferSource, importObject?: object): Promise<WebAssemblyInstantiatedSource>;
function instantiate(moduleObject: Module, importObject?: object): Promise<Instance>;
function instantiateStreaming(source: Response | Promise<Response>, importObject?: object): Promise<WebAssemblyInstantiatedSource>;
function validate(bytes: BufferSource): boolean;
}

Expand Down
3 changes: 1 addition & 2 deletions src/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ export const bufferSourceTypes = new Set(["ArrayBuffer", "ArrayBufferView", "Dat
export const integerTypes = new Set(["byte", "octet", "short", "unsigned short", "long", "unsigned long", "long long", "unsigned long long"]);
export const stringTypes = new Set(["ByteString", "DOMString", "USVString", "CSSOMString"]);
const floatTypes = new Set(["float", "unrestricted float", "double", "unrestricted double"]);
const sameTypes = new Set(["any", "boolean", "Date", "Function", "Promise", "void"]);
const sameTypes = new Set(["any", "boolean", "object", "Date", "Function", "Promise", "void"]);
export const baseTypeConversionMap = new Map<string, string>([
...[...bufferSourceTypes].map(type => [type, type] as [string, string]),
...[...integerTypes].map(type => [type, "number"] as [string, string]),
...[...floatTypes].map(type => [type, "number"] as [string, string]),
...[...stringTypes].map(type => [type, "string"] as [string, string]),
...[...sameTypes].map(type => [type, type] as [string, string]),
["object", "any"],
["sequence", "Array"],
["record", "Record"],
["FrozenArray", "ReadonlyArray"],
Expand Down