Update resources/webidl2 to 88c5c5b6bb675d0d95ae3ec4db3258768d0c8fc0

web-platform-tests · Apr 24, 2017 · 7ad1bd2 · 7ad1bd2
2 parents 0085e16 + 3afe26c
commit 7ad1bd2
Show file tree

Hide file tree

Showing 26 changed files with 2,287 additions and 1,945 deletions.
diff --git a/resources/webidl2/README.md b/resources/webidl2/README.md
diff --git a/resources/webidl2/lib/webidl2.js b/resources/webidl2/lib/webidl2.js
diff --git a/resources/webidl2/lib/writer.js b/resources/webidl2/lib/writer.js
diff --git a/resources/webidl2/package.json b/resources/webidl2/package.json
@@ -1,17 +1,17 @@
 {
   "name": "webidl2",
   "description": "A WebIDL Parser",
-  "version": "2.0.11",
+  "version": "2.4.0",
   "author": "Robin Berjon <robin@berjon.com>",
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "mocha": "2.2.5",
-    "expect.js": "0.3.1",
+    "mocha": "3.2.0",
+    "expect": "1.20.2",
     "underscore": "1.8.3",
-    "jsondiffpatch": "0.1.31",
+    "jsondiffpatch": "0.2.4",
     "benchmark": "*",
-    "microtime": "1.4.2"
+    "microtime": "2.1.3"
   },
   "scripts": {
     "test": "mocha"

diff --git a/resources/webidl2/test/invalid.js b/resources/webidl2/test/invalid.js
@@ -4,7 +4,7 @@
 //    are fully correct interpretations of the IDLs
 
 var wp = process.env.JSCOV ? require("../lib-cov/webidl2") : require("../lib/webidl2")
-,   expect = require("expect.js")
+,   expect = require("expect")
 ,   pth = require("path")
 ,   fs = require("fs")
 ;
@@ -16,7 +16,7 @@ describe("Parses all of the invalid IDLs to check that they blow up correctly",
                   .map(function (it) { return pth.join(dir, it); })
     ,   errors = idls.map(function (it) { return pth.join(__dirname, "invalid", "json", pth.basename(it).replace(/\.w?idl/, ".json")); })
     ;
-    
+
     for (var i = 0, n = idls.length; i < n; i++) {
         var idl = idls[i], error = JSON.parse(fs.readFileSync(errors[i], "utf8"));
         var func = (function (idl, err) {
@@ -30,11 +30,11 @@ describe("Parses all of the invalid IDLs to check that they blow up correctly",
                     error = e;
                 }
                 finally {
-                    expect(error).to.be.ok();
-                    expect(error.message).to.equal(err.message);
-                    expect(error.line).to.equal(err.line);
+                    expect(error).toExist();
+                    expect(error.message).toEqual(err.message);
+                    expect(error.line).toEqual(err.line);
                 }
-                
+
             };
         }(idl, error));
         it("should produce the right error for " + idl, func);

diff --git a/resources/webidl2/test/invalid/idl/record-key.widl b/resources/webidl2/test/invalid/idl/record-key.widl
@@ -0,0 +1,3 @@
+interface Foo {
+  void foo(record<octet, any> param);
+};
diff --git a/resources/webidl2/test/invalid/json/record-key.json b/resources/webidl2/test/invalid/json/record-key.json
@@ -0,0 +1,4 @@
+{
+    "message": "Record key must be DOMString, USVString, or ByteString",
+    "line": 2
+}
diff --git a/resources/webidl2/test/syntax.js b/resources/webidl2/test/syntax.js
@@ -1,6 +1,6 @@
 
 var wp = process.env.JSCOV ? require("../lib-cov/webidl2") : require("../lib/webidl2")
-,   expect = require("expect.js")
+,   expect = require("expect")
 ,   pth = require("path")
 ,   fs = require("fs")
 ,   jdp = require("jsondiffpatch")
@@ -14,7 +14,7 @@ describe("Parses all of the IDLs to produce the correct ASTs", function () {
                   .map(function (it) { return pth.join(dir, it); })
     ,   jsons = idls.map(function (it) { return pth.join(__dirname, "syntax/json", pth.basename(it).replace(".widl", ".json")); })
     ;
-    
+
     for (var i = 0, n = idls.length; i < n; i++) {
         var idl = idls[i], json = jsons[i];
 
@@ -28,7 +28,7 @@ describe("Parses all of the IDLs to produce the correct ASTs", function () {
                     var diff = jdp.diff(JSON.parse(fs.readFileSync(json, "utf8")),
                                         wp.parse(fs.readFileSync(idl, "utf8"), opt));
                     if (diff && debug) console.log(JSON.stringify(diff, null, 4));
-                    expect(diff).to.be(undefined);
+                    expect(diff).toBe(undefined);
                 }
                 catch (e) {
                     console.log(e.toString());

diff --git a/resources/webidl2/test/syntax/idl/extended-attributes.widl b/resources/webidl2/test/syntax/idl/extended-attributes.widl
@@ -3,4 +3,9 @@
 [Global=(Worker,ServiceWorker), Exposed=ServiceWorker]
 interface ServiceWorkerGlobalScope : WorkerGlobalScope {
 
-};
+};
+
+// Conformance with ExtendedAttributeList grammar in http://www.w3.org/TR/WebIDL/#idl-extended-attributes
+// Section 3.11
+[IntAttr=0, FloatAttr=3.14, StringAttr="abc"]
+interface IdInterface {};
diff --git a/resources/webidl2/test/syntax/idl/map.widl b/resources/webidl2/test/syntax/idl/map.widl
diff --git a/resources/webidl2/test/syntax/idl/namespace.widl b/resources/webidl2/test/syntax/idl/namespace.widl
@@ -0,0 +1,10 @@
+// Extracted from Web IDL editors draft March 27 2017
+namespace VectorUtils {
+  readonly attribute Vector unit;
+  double dotProduct(Vector x, Vector y);
+  Vector crossProduct(Vector x, Vector y);
+};
+
+partial namespace SomeNamespace {
+  /* namespace_members... */
+};
diff --git a/resources/webidl2/test/syntax/idl/record.widl b/resources/webidl2/test/syntax/idl/record.widl
@@ -0,0 +1,8 @@
+[Constructor(record<USVString, USVString> init)]
+interface Foo {
+  void foo(sequence<record<ByteString, any>> param);
+  record<DOMString, (float or DOMString)?> bar();
+
+  // Make sure record can still be registered as a type.
+  record baz();
+};
diff --git a/resources/webidl2/test/syntax/idl/typedef-nested.widl b/resources/webidl2/test/syntax/idl/typedef-nested.widl
diff --git a/resources/webidl2/test/syntax/idl/typedef-union.idl b/resources/webidl2/test/syntax/idl/typedef-union.idl
@@ -0,0 +1,4 @@
+  typedef (ImageData or
+           HTMLImageElement or
+           HTMLCanvasElement or
+           HTMLVideoElement) TexImageSource;
diff --git a/resources/webidl2/test/syntax/idl/uniontype.widl b/resources/webidl2/test/syntax/idl/uniontype.widl
@@ -1,3 +1,4 @@
 interface Union {
  attribute (float or (Date or Event) or (Node or DOMString)?) test;
+ attribute ([EnforceRange] long or Date) test2;
 };
diff --git a/resources/webidl2/test/syntax/json/extended-attributes.json b/resources/webidl2/test/syntax/json/extended-attributes.json
@@ -26,5 +26,38 @@
                 }
             }
         ]
+    },
+    {
+      "type": "interface",
+      "name": "IdInterface",
+      "partial": false,
+      "members": [],
+      "inheritance": null,
+      "extAttrs": [
+        {
+          "name": "IntAttr",
+          "arguments": null,
+          "rhs": {
+            "type": "integer",
+            "value": "0"
+          }
+        },
+        {
+          "name": "FloatAttr",
+          "arguments": null,
+          "rhs": {
+            "type": "float",
+            "value": "3.14"
+          }
+        },
+        {
+          "name": "StringAttr",
+          "arguments": null,
+          "rhs": {
+            "type": "string",
+            "value": "\"abc\""
+          }
+        }
+      ]
     }
-]
+]
diff --git a/resources/webidl2/test/syntax/json/identifier-qualified-names.json b/resources/webidl2/test/syntax/json/identifier-qualified-names.json
@@ -1,7 +1,6 @@
 [
     {
         "type": "typedef",
-        "typeExtAttrs": [],
         "idlType": {
             "sequence": false,
             "generic": null,
@@ -214,4 +213,4 @@
         "inheritance": null,
         "extAttrs": []
     }
-]
+]
diff --git a/resources/webidl2/test/syntax/json/map.json b/resources/webidl2/test/syntax/json/map.json
diff --git a/resources/webidl2/test/syntax/json/namespace.json b/resources/webidl2/test/syntax/json/namespace.json
@@ -0,0 +1,134 @@
+[
+    {
+        "type": "namespace",
+        "name": "VectorUtils",
+        "partial": false,
+        "members": [
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": true,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "Vector"
+                },
+                "name": "unit",
+                "extAttrs": []
+            },
+            {
+                "type": "operation",
+                "getter": false,
+                "setter": false,
+                "creator": false,
+                "deleter": false,
+                "legacycaller": false,
+                "static": false,
+                "stringifier": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "double"
+                },
+                "name": "dotProduct",
+                "arguments": [
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "Vector"
+                        },
+                        "name": "x"
+                    },
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "Vector"
+                        },
+                        "name": "y"
+                    }
+                ],
+                "extAttrs": []
+            },
+            {
+                "type": "operation",
+                "getter": false,
+                "setter": false,
+                "creator": false,
+                "deleter": false,
+                "legacycaller": false,
+                "static": false,
+                "stringifier": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "Vector"
+                },
+                "name": "crossProduct",
+                "arguments": [
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "Vector"
+                        },
+                        "name": "x"
+                    },
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "Vector"
+                        },
+                        "name": "y"
+                    }
+                ],
+                "extAttrs": []
+            }
+        ],
+        "extAttrs": []
+    },
+    {
+        "type": "namespace",
+        "name": "SomeNamespace",
+        "partial": true,
+        "members": [],
+        "extAttrs": []
+    }
+]