Skip to content

Commit 5f8851e

Browse files
FranklinWhaleFranklinWhale
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
2 parents fce7fa7 + 363eccd commit 5f8851e

File tree

7 files changed

+143
-18
lines changed

7 files changed

+143
-18
lines changed

‎Shared.fsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ module JsonItems =
6969
| Indexer
7070
| SignatureOverload
7171
| TypeDef
72+
| Extends
7273
override x.ToString() = (unionToString x).ToLower()
7374

7475
let findItem (allItems: ItemsType.Root []) (itemName: string) (kind: ItemKind) otherFilter =

‎TS.fsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,15 @@ let EmitNamedConstructors () =
381381

382382
let EmitInterfaceDeclaration (i:Browser.Interface) =
383383
Pt.printl "interface %s" i.Name
384-
match i.Extends::(List.ofArray i.Implements) with
385-
| [""] | [] | ["Object"] -> ()
384+
let extendsFromSpec =
385+
match i.Extends::(List.ofArray i.Implements) with
386+
| [""] | [] | ["Object"] -> []
387+
| specExtends -> specExtends
388+
let extendsFromJson =
389+
JsonItems.getAddedItemsByInterfaceName ItemKind.Extends Flavor.All i.Name
390+
|> Array.map (fun e -> e.BaseInterface.Value) |> List.ofArray
391+
match List.concat [extendsFromSpec; extendsFromJson] with
392+
| [] -> ()
386393
| allExtends -> Pt.print " extends %s" (String.Join(", ", allExtends))
387394
Pt.print " {"
388395

‎baselines/dom.generated.d.ts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7571,10 +7571,12 @@ interface IDBDatabase extends EventTarget {
75717571
onabort: (ev: Event) => any;
75727572
onerror: (ev: Event) => any;
75737573
version: number;
7574+
onversionchange: (ev: IDBVersionChangeEvent) => any;
75747575
close(): void;
75757576
createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
75767577
deleteObjectStore(name: string): void;
75777578
transaction(storeNames: string | string[], mode?: string): IDBTransaction;
7579+
addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
75787580
addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
75797581
addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
75807582
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -11397,7 +11399,7 @@ declare var StereoPannerNode: {
1139711399
interface Storage {
1139811400
length: number;
1139911401
clear(): void;
11400-
getItem(key: string): any;
11402+
getItem(key: string): string;
1140111403
key(index: number): string;
1140211404
removeItem(key: string): void;
1140311405
setItem(key: string, data: string): void;
@@ -12052,34 +12054,34 @@ interface WebGLRenderingContext {
1205212054
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
1205312055
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
1205412056
uniform1f(location: WebGLUniformLocation, x: number): void;
12055-
uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
12057+
uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
1205612058
uniform1i(location: WebGLUniformLocation, x: number): void;
12057-
uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
12059+
uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
1205812060
uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
12059-
uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
12061+
uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
1206012062
uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
12061-
uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
12063+
uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
1206212064
uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
12063-
uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
12065+
uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
1206412066
uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
12065-
uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
12067+
uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
1206612068
uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
12067-
uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
12069+
uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
1206812070
uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
12069-
uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
12070-
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
12071-
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
12072-
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
12071+
uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
12072+
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
12073+
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
12074+
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
1207312075
useProgram(program: WebGLProgram): void;
1207412076
validateProgram(program: WebGLProgram): void;
1207512077
vertexAttrib1f(indx: number, x: number): void;
12076-
vertexAttrib1fv(indx: number, values: Float32Array): void;
12078+
vertexAttrib1fv(indx: number, values: Float32Array | number[]): void;
1207712079
vertexAttrib2f(indx: number, x: number, y: number): void;
12078-
vertexAttrib2fv(indx: number, values: Float32Array): void;
12080+
vertexAttrib2fv(indx: number, values: Float32Array | number[]): void;
1207912081
vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
12080-
vertexAttrib3fv(indx: number, values: Float32Array): void;
12082+
vertexAttrib3fv(indx: number, values: Float32Array | number[]): void;
1208112083
vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
12082-
vertexAttrib4fv(indx: number, values: Float32Array): void;
12084+
vertexAttrib4fv(indx: number, values: Float32Array | number[]): void;
1208312085
vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
1208412086
viewport(x: number, y: number, width: number, height: number): void;
1208512087
ACTIVE_ATTRIBUTES: number;

‎baselines/webworker.generated.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,12 @@ interface IDBDatabase extends EventTarget {
315315
onabort: (ev: Event) => any;
316316
onerror: (ev: Event) => any;
317317
version: number;
318+
onversionchange: (ev: IDBVersionChangeEvent) => any;
318319
close(): void;
319320
createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
320321
deleteObjectStore(name: string): void;
321322
transaction(storeNames: string | string[], mode?: string): IDBTransaction;
323+
addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
322324
addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
323325
addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
324326
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

‎inputfiles/addedTypes.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,5 +409,17 @@
409409
"interface": "HTMLTextAreaElement",
410410
"name": "minLength",
411411
"type": "number"
412+
},
413+
{
414+
"kind": "property",
415+
"interface": "IDBDatabase",
416+
"name": "onversionchange",
417+
"type": "(ev: IDBVersionChangeEvent) => any"
418+
},
419+
{
420+
"kind": "method",
421+
"interface": "IDBDatabase",
422+
"name": "addEventListener",
423+
"signatures": ["addEventListener(type: \"versionchange\", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void"]
412424
}
413425
]

‎inputfiles/overridingTypes.json

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,5 +559,101 @@
559559
"interface": "IDBIndex",
560560
"name": "getKey",
561561
"signatures": ["getKey(key: IDBKeyRange | IDBValidKey): IDBRequest"]
562+
},
563+
{
564+
"kind": "method",
565+
"interface": "Storage",
566+
"name": "getItem",
567+
"signatures": ["getItem(key: string): string"]
568+
},
569+
{
570+
"kind": "method",
571+
"interface": "WebGLRenderingContext",
572+
"name": "uniform1fv",
573+
"signatures": ["uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"]
574+
},
575+
{
576+
"kind": "method",
577+
"interface": "WebGLRenderingContext",
578+
"name": "uniform2fv",
579+
"signatures": ["uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"]
580+
},
581+
{
582+
"kind": "method",
583+
"interface": "WebGLRenderingContext",
584+
"name": "uniform3fv",
585+
"signatures": ["uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"]
586+
},
587+
{
588+
"kind": "method",
589+
"interface": "WebGLRenderingContext",
590+
"name": "uniform4fv",
591+
"signatures": ["uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"]
592+
},
593+
{
594+
"kind": "method",
595+
"interface": "WebGLRenderingContext",
596+
"name": "uniform1iv",
597+
"signatures": ["uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"]
598+
},
599+
{
600+
"kind": "method",
601+
"interface": "WebGLRenderingContext",
602+
"name": "uniform2iv",
603+
"signatures": ["uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"]
604+
},
605+
{
606+
"kind": "method",
607+
"interface": "WebGLRenderingContext",
608+
"name": "uniform3iv",
609+
"signatures": ["uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"]
610+
},
611+
{
612+
"kind": "method",
613+
"interface": "WebGLRenderingContext",
614+
"name": "uniform4iv",
615+
"signatures": ["uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"]
616+
},
617+
{
618+
"kind": "method",
619+
"interface": "WebGLRenderingContext",
620+
"name": "uniformMatrix2fv",
621+
"signatures": ["uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"]
622+
},
623+
{
624+
"kind": "method",
625+
"interface": "WebGLRenderingContext",
626+
"name": "uniformMatrix3fv",
627+
"signatures": ["uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"]
628+
},
629+
{
630+
"kind": "method",
631+
"interface": "WebGLRenderingContext",
632+
"name": "uniformMatrix4fv",
633+
"signatures": ["uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"]
634+
},
635+
{
636+
"kind": "method",
637+
"interface": "WebGLRenderingContext",
638+
"name": "vertexAttrib1fv",
639+
"signatures": ["vertexAttrib1fv(indx: number, values: Float32Array | number[]): void"]
640+
},
641+
{
642+
"kind": "method",
643+
"interface": "WebGLRenderingContext",
644+
"name": "vertexAttrib2fv",
645+
"signatures": ["vertexAttrib2fv(indx: number, values: Float32Array | number[]): void"]
646+
},
647+
{
648+
"kind": "method",
649+
"interface": "WebGLRenderingContext",
650+
"name": "vertexAttrib3fv",
651+
"signatures": ["vertexAttrib3fv(indx: number, values: Float32Array | number[]): void"]
652+
},
653+
{
654+
"kind": "method",
655+
"interface": "WebGLRenderingContext",
656+
"name": "vertexAttrib4fv",
657+
"signatures": ["vertexAttrib4fv(indx: number, values: Float32Array | number[]): void"]
562658
}
563659
]

‎inputfiles/sample.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,5 +330,10 @@
330330
"kind": "typedef",
331331
"name": "IDBValidKey",
332332
"type": "number | string | Date | IDBArrayKey"
333+
},
334+
{
335+
"kind": "extends",
336+
"baseInterface": "ParentNode",
337+
"interface": "Document"
333338
}
334339
]

0 commit comments

Comments
 (0)