Merge with master

Author: zhengbli

.gitignore

@@ -162,6 +162,7 @@ ClientBin/
 *.publishsettings
 node_modules/
 bower_components/
+.DS_Store
 
 # RIA/Silverlight projects
 Generated_Code/

README.md

@@ -1,17 +1,34 @@
 # TypeScript and JavaScript lib generator
+
+[![Build status](https://ci.appveyor.com/api/projects/status/8oj3j7u6nvag1xvu/branch/master?svg=true)](https://ci.appveyor.com/project/zhengbli/tsjs-lib-generator/branch/master)
+
 This tool is used to generate `dom.generated.d.ts` and `webworker.generated.d.ts` for TypeScript, and `domWeb.js` and `domWindows.js` for Visual Studio JavaScript language service. The input file is the XML spec file generated by the Microsoft Edge browser.
 
 ## Build Instruction
-To build the tool, simply clone the repo, and run `build.cmd` in command line or powershell. If it runs successfully, the output files will be generated under the `generated` folder.
+To build the tool, simply clone the repo, and run `build.cmd` (Windows) or `build.sh` (OS X/Unix) in command line. If it runs successfully, the output files will be generated under the `generated` folder.
+
+Note: for OS X/ Unix users, [Mono 4.2](http://www.mono-project.com/download/alpha/) is required.
+
+## Contribution Guide
+The `dom.generated.d.ts` and `webworker.generated.d.ts` files in the TypeScript repo are used as baselines. 
+For each pull request, we will run the script and compare the generated files with the baseline files. 
+In order to make the tests pass, please update the baseline as well in any pull requests. 
+
+For common changes, it is sufficient to change the json files. 
+There are three json files that are used to alter the file generation: `addedTypes.json`, `overridingTypes.json` and `removedTypes.json`.
+The format of each file can be inferred from their existing content. 
+
+The common steps to send a pull request are:
+  0. Open or refer to an issue in the [TypeScript repo](https://github.com/Microsoft/TypeScript).
+  1. Add missing elements to `inputfiles/addedTypes.json`, overriding elements to `inputfiles/overridingTypes.json`, or  elements to remove to `inputfiles/removedTypes.json`.
+  2. Run the script locally to obtain new `dom.generated.d.ts` and `webworker.generated.d.ts`. 
+  3. Update the files in the `baselines` folder using the newly generated files.
 
 ## Code Structure
 - `Shared.fs`: handles the parsing from XML spec file, and stores the common data structures for later use;
 - `TS.fs`: handles the emitting of the `lib.d.ts` file;
 - `JS.fs`: handles the emitting of the `domWeb.js` and `domWindows.js`
 
-## Contribution Guide
-The `dom.generated.d.ts` and `webworker.generated.d.ts` files that are used in TypeScript repo `master` branch are used as baselines. For each pull request, we will try run the script and compare the generated files with the baseline files. So to make the tests passed, please update the baseline and the code at the same pull request. 
-
 ## Input Files:
 - `browser.webidl.xml`: the XML spec file generated by Microsoft Edge (due to the different updating schedules between Edge and TypeScript, this may **not** be the most up-to-date version of the spec.);
 - `webworker.webidl.xml`: contains additional types for webworker.

Shared.fsx

@@ -1,4 +1,4 @@
-#r @"packages\FSharp.Data\lib\net40\FSharp.Data.dll"
+#r "packages/FSharp.Data/lib/net40/FSharp.Data.dll"
 #r "System.Xml.Linq.dll"
 
 open FSharp.Data
@@ -12,11 +12,11 @@ open Microsoft.FSharp.Reflection
 /// Global variables
 /// ===========================================
 module GlobalVars = 
-    if not (Directory.Exists(__SOURCE_DIRECTORY__ + @"\generated")) then 
-        Directory.CreateDirectory(__SOURCE_DIRECTORY__ + @"\generated") |> ignore
+    if not (Directory.Exists(__SOURCE_DIRECTORY__ + @"/generated")) then 
+        Directory.CreateDirectory(__SOURCE_DIRECTORY__ + @"/generated") |> ignore
 
-    let inputFolder = __SOURCE_DIRECTORY__ + @"\inputfiles"
-    let makeTextWriter fileName = File.CreateText(__SOURCE_DIRECTORY__ + @"\generated\" + fileName) :> TextWriter
+    let inputFolder = __SOURCE_DIRECTORY__ + @"/inputfiles"
+    let makeTextWriter fileName = File.CreateText(__SOURCE_DIRECTORY__ + @"/generated/" + fileName) :> TextWriter
     // let jsWebOutput = makeTextWriter "domWeb.js"
     // let jsWinOutput = makeTextWriter "domWindows.js"
     // let jsWorkerOutput = makeTextWriter "dedicatedworker.js"
@@ -49,13 +49,13 @@ module JsonItems =
     type ItemsType = JsonProvider<"inputfiles/sample.json">
 
     let overriddenItems = 
-        File.ReadAllText(GlobalVars.inputFolder + @"\overridingTypes.json") |> ItemsType.Parse
+        File.ReadAllText(GlobalVars.inputFolder + @"/overridingTypes.json") |> ItemsType.Parse
 
     let removedItems = 
-        File.ReadAllText(GlobalVars.inputFolder + @"\removedTypes.json") |> ItemsType.Parse
+        File.ReadAllText(GlobalVars.inputFolder + @"/removedTypes.json") |> ItemsType.Parse
 
     let addedItems = 
-        File.ReadAllText(GlobalVars.inputFolder + @"\addedTypes.json") |> ItemsType.Parse
+        File.ReadAllText(GlobalVars.inputFolder + @"/addedTypes.json") |> ItemsType.Parse
 
     // This is the kind of items in the external json files that are used as a 
     // correction for the spec.
@@ -95,7 +95,7 @@ module JsonItems =
 module Comments =
     type CommentType = JsonProvider<"inputfiles/comments.json">
 
-    let comments = File.ReadAllText(__SOURCE_DIRECTORY__ + @"\inputfiles\comments.json") |> CommentType.Parse
+    let comments = File.ReadAllText(__SOURCE_DIRECTORY__ + @"/inputfiles/comments.json") |> CommentType.Parse
 
     let GetCommentForProperty iName pName = 
         match comments.Interfaces |> Array.tryFind (fun i -> i.Name = iName) with

TS.fsx

@@ -545,13 +545,20 @@ let EmitAddedInterface (ai: JsonItems.ItemsType.Root) =
     match ai.Extends with 
     | Some e -> Pt.printl "interface %s extends %s {" ai.Name.Value ai.Extends.Value
     | None -> Pt.printl "interface %s {" ai.Name.Value
-    
+
     ai.Properties |> Array.iter (fun p -> Pt.printWithAddedIndent "%s: %s;" p.Name p.Type)
     ai.Methods |> Array.collect (fun m -> m.Signatures) |> Array.iter (Pt.printWithAddedIndent "%s;")
     ai.Indexer |> Array.collect (fun i -> i.Signatures) |> Array.iter (Pt.printWithAddedIndent "%s;")
     Pt.printl "}"
     Pt.printl ""
 
+    if ai.ConstructorSignatures.Length > 0 then
+        Pt.printl "declare var %s: {" ai.Name.Value
+        Pt.printWithAddedIndent "prototype: %s;" ai.Name.Value
+        ai.ConstructorSignatures |> Array.iter (Pt.printWithAddedIndent "%s;")
+        Pt.printl "}"
+        Pt.printl "" 
+
 let EmitTheWholeThing flavor (target:TextWriter) =
     Pt.reset()
     Pt.printl "/////////////////////////////"

baselines/dom.generated.d.ts

@@ -2058,6 +2058,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string;
+    currentScript: HTMLScriptElement;
     adoptNode(source: Node): Node;
     captureEvents(): void;
     clear(): void;
@@ -7071,7 +7072,7 @@ declare var IDBVersionChangeEvent: {
 }
 
 interface ImageData {
-    data: number[];
+    data: Uint8ClampedArray;
     height: number;
     width: number;
 }
@@ -7869,6 +7870,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
+    vibrate(pattern: number | number[]): boolean;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7909,6 +7911,7 @@ interface Node extends EventTarget {
     normalize(): void;
     removeChild(oldChild: Node): Node;
     replaceChild(newChild: Node, oldChild: Node): Node;
+    contains(node: Node): boolean;
     ATTRIBUTE_NODE: number;
     CDATA_SECTION_NODE: number;
     COMMENT_NODE: number;

baselines/webworker.generated.d.ts

@@ -460,7 +460,7 @@ declare var IDBVersionChangeEvent: {
 }
 
 interface ImageData {
-    data: number[];
+    data: Uint8ClampedArray;
     height: number;
     width: number;
 }

build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+if [ ! -d ".paket" ]; then
+	mkdir ".paket"
+	curl https://github.com/fsprojects/Paket/releases/download/2.12.5/paket.bootstrapper.exe -L --insecure -o .paket/paket.bootstrapper.exe
+fi
+
+mono .paket/paket.bootstrapper.exe
+exit_code=$?
+if [ $exit_code -ne 0 ]; then
+	exit $exit_code
+fi
+
+mono .paket/paket.exe restore
+exit_code=$?
+if [ $exit_code -ne 0 ]; then
+	exit $exit_code
+fi
+
+mono packages/FAKE/tools/FAKE.exe build.fsx 

inputfiles/addedTypes.json

@@ -212,5 +212,23 @@
             "createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"view\"): SVGViewElement",
             "createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: string): SVGElement"
         ]
-    }
+    },
+    {
+        "kind": "method",
+        "interface": "Node",
+        "signatures":["contains(node: Node): boolean"]
+    },
+    {
+        "kind": "method",
+        "interface": "Navigator",
+        "signatures": [
+            "vibrate(pattern: number | number[]): boolean"
+        ]
+    },
+    {
+        "kind": "property",
+        "interface": "Document",
+        "name": "currentScript",
+        "type": "HTMLScriptElement"
+     }
 ]

inputfiles/overridingTypes.json

@@ -211,5 +211,11 @@
         "interface": "HTMLSelectElement",
         "name": "options",
         "type": "HTMLSelectElement | HTMLCollection"
+    },
+    {
+        "kind": "property",
+        "interface": "ImageData",
+        "name": "data",
+        "type": "Uint8ClampedArray"
     }
 ]

inputfiles/sample.json

@@ -53,6 +53,9 @@
     {
         "kind": "interface",
         "name": "BlobPropertyBag",
+        "constructorSignatures": [
+            "new(): NodeList"
+        ],
         "properties": [
             {
                 "name": "type?",