fix(lib/validator): validate when overloads are all from mixins

README.md

@@ -18,10 +18,10 @@ Just the usual. For Node:
 npm install webidl2
 ```
 
-In the browser:
+In the browser without module support:
 
 ```HTML
-<script src='webidl2.js'></script>
+<script src='./webidl2/dist/webidl2.js'></script>
 ```
 
 ## Documentation
@@ -35,21 +35,26 @@ WebIDL2 provides two functions: `parse` and `write`.
 In Node, that happens with:
 
 ```JS
-var WebIDL2 = require("webidl2");
-var tree = WebIDL2.parse("string of WebIDL");
-var text = WebIDL2.write(tree);
+const { parse, write, validate } = require("webidl2");
+const tree = parse("string of WebIDL");
+const text = write(tree);
+const validation = validate(tree);
 ```
 
 In the browser:
 ```HTML
-<script src='webidl2.js'></script>
 <script>
-  var tree = WebIDL2.parse("string of WebIDL");
+  const tree = WebIDL2.parse("string of WebIDL");
+  const text = WebIDL2.write(tree);
+  const validation = WebIDL2.validate(tree);
 </script>
 
-<script src='writer.js'></script>
-<script>
-  var text = WebIDL2Writer.write(tree);
+<!-- Or when module is supported -->
+<script type="module">
+  import { parse, write, validate } from "./webidl2/index.js";
+  const tree = parse("string of WebIDL");
+  const text = write(tree);
+  const validation = validate(tree);
 </script>
 ```
 
@@ -89,11 +94,6 @@ var result = WebIDL2.write(tree, {
      * @param type The `wrap()`ed result of references and syntatic bracket strings.
      */
     type: type => type,
-    /**
-     * Called for each value literals, e.g. `"string"` or `3.12`.
-     * @param {string} lit The raw literal string.
-     */
-    valueLiteral: lit => lit,
     /**
      * Receives the return value of `reference()`. String if it's absent.
      */
@@ -121,6 +121,17 @@ var result = WebIDL2.write(tree, {
 
 "Wrapped value" here will all be raw strings when the `wrap()` callback is absent.
 
+`validate()` returns semantic errors in a string array form:
+
+```js
+const validations = validate(tree);
+for (const validation of validations) {
+  console.log(validation);
+}
+// Validation error on line X: ...
+// Validation error on line Y: ...
+```
+
 ### Errors
 
 When there is a syntax error in the WebIDL, it throws an exception object with the following

lib/validator.js

@@ -89,32 +89,31 @@ function* checkInterfaceMemberDuplication(defs) {
   }
 
   function* forEachInterface(i) {
-    const opNames = getOperationNames(i);
+    const opNames = new Set(getOperations(i).map(op => op.name));
     const partials = defs.partials.get(i.name) || [];
     const mixins = includesMap.get(i.name) || [];
-    for (const partial of partials) {
-      yield* forEachExtension(partial, opNames, i);
-    }
-    for (const mixin of mixins) {
-      yield* forEachExtension(mixin, opNames, i);
+    for (const ext of [...partials, ...mixins]) {
+      const additions = getOperations(ext);
+      yield* forEachExtension(additions, opNames, ext, i);
+      for (const addition of additions) {
+        opNames.add(addition.name);
+      }
     }
   }
 
-  function* forEachExtension(ext, names, base) {
-    for (const op of ext.members.filter(mem => mem.type === "operation")) {
-      const name = (op.body && op.body.name) ? op.body.name.value : "";
-      if (name && names.has(name)) {
-        const message = `The operation "${name}" has already been defined in the base interface "${base.name}"`;
-        yield error(ext.source, op.body.tokens.name, ext, message);
+  function* forEachExtension(additions, existings, ext, base) {
+    for (const addition of additions) {
+      const { name } = addition;
+      if (name && existings.has(name)) {
+        const message = `The operation "${name}" has already been defined for the base interface "${base.name}" either in itself or in a mixin`;
+        yield error(ext.source, addition.body.tokens.name, ext, message);
       }
     }
   }
 
-  function getOperationNames(i) {
-    const names = i.members
-      .filter(({type}) => type === "operation")
-      .map(op => (op.body && op.body.name) ? op.body.name.value : "");
-    return new Set(names);
+  function getOperations(i) {
+    return i.members
+      .filter(({type}) => type === "operation");
   }
 
   function getIncludesMap() {

lib/webidl2.js

@@ -955,6 +955,9 @@ function parseByTokens(source) {
     get type() {
       return "operation";
     }
+    get name() {
+      return (this.body && this.body.name && this.body.name.value) || "";
+    }
     get special() {
       return untype_token(this.tokens.special);
     }

test/invalid/baseline/overloads.txt

@@ -1,6 +1,18 @@
 Validation error at line 7, inside `partial interface Base`:
   void unique(short num)
-       ^ The operation "unique" has already been defined in the base interface "Base"
+       ^ The operation "unique" has already been defined for the base interface "Base" either in itself or in a mixin
 Validation error at line 11, inside `interface mixin Extension`:
   void unique(string str)
-       ^ The operation "unique" has already been defined in the base interface "Base"
+       ^ The operation "unique" has already been defined for the base interface "Base" either in itself or in a mixin
+Validation error at line 21, inside `interface mixin WebGL2RenderingContextBase`:
+  void bufferData(GLenum target,
+       ^ The operation "bufferData" has already been defined for the base interface "WebGL2RenderingContext" either in itself or in a mixin
+Validation error at line 22, inside `interface mixin WebGL2RenderingContextBase`:
+  void bufferData(GLenum target,
+       ^ The operation "bufferData" has already been defined for the base interface "WebGL2RenderingContext" either in itself or in a mixin
+Validation error at line 23, inside `interface mixin WebGL2RenderingContextBase`:
+  void bufferData(GLenum target,
+       ^ The operation "bufferData" has already been defined for the base interface "WebGL2RenderingContext" either in itself or in a mixin
+Validation error at line 25, inside `interface mixin WebGL2RenderingContextBase`:
+  void bufferData(GLenum target,
+       ^ The operation "bufferData" has already been defined for the base interface "WebGL2RenderingContext" either in itself or in a mixin

test/invalid/idl/overloads.widl

@@ -12,3 +12,30 @@ interface mixin Extension {
 };
 Base includes Extension;
 Base includes Unknown;
+
+// WebGL
+
+interface mixin WebGL2RenderingContextBase
+{
+  // WebGL1:
+  void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+  void bufferData(GLenum target, ArrayBuffer? srcData, GLenum usage);
+  void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage);
+  // WebGL2:
+  void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage, GLuint srcOffset,
+                  optional GLuint length = 0);
+};
+
+interface mixin WebGLRenderingContextBase
+{
+  void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+  void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
+  void bufferData(GLenum target, ArrayBufferView data, GLenum usage);
+};
+
+[Exposed=(Window,Worker)]
+interface WebGL2RenderingContext
+{
+};
+WebGL2RenderingContext includes WebGLRenderingContextBase;
+WebGL2RenderingContext includes WebGL2RenderingContextBase;

test/syntax/baseline/allowany.json

@@ -7,6 +7,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "g",
                 "body": {
                     "name": {
                         "value": "g",
@@ -43,6 +44,7 @@
             },
             {
                 "type": "operation",
+                "name": "g",
                 "body": {
                     "name": {
                         "value": "g",
@@ -107,6 +109,7 @@
             },
             {
                 "type": "operation",
+                "name": "g",
                 "body": {
                     "name": {
                         "value": "g",

test/syntax/baseline/callback.json

@@ -65,6 +65,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "eventOccurred",
                 "body": {
                     "name": {
                         "value": "eventOccurred",

test/syntax/baseline/enum.json

@@ -104,6 +104,7 @@
             },
             {
                 "type": "operation",
+                "name": "initialize",
                 "body": {
                     "name": {
                         "value": "initialize",

test/syntax/baseline/equivalent-decl.json

@@ -41,6 +41,7 @@
             },
             {
                 "type": "operation",
+                "name": "getProperty",
                 "body": {
                     "name": {
                         "value": "getProperty",
@@ -108,6 +109,7 @@
             },
             {
                 "type": "operation",
+                "name": "setProperty",
                 "body": {
                     "name": {
                         "value": "setProperty",
@@ -256,6 +258,7 @@
             },
             {
                 "type": "operation",
+                "name": "getProperty",
                 "body": {
                     "name": {
                         "value": "getProperty",
@@ -320,6 +323,7 @@
             },
             {
                 "type": "operation",
+                "name": "setProperty",
                 "body": {
                     "name": {
                         "value": "setProperty",
@@ -414,6 +418,7 @@
             },
             {
                 "type": "operation",
+                "name": "",
                 "body": {
                     "name": null,
                     "idlType": {
@@ -477,6 +482,7 @@
             },
             {
                 "type": "operation",
+                "name": "",
                 "body": {
                     "name": null,
                     "idlType": {

test/syntax/baseline/generic.json

@@ -7,6 +7,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "bar",
                 "body": {
                     "name": {
                         "value": "bar",
@@ -185,6 +186,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "getServiced",
                 "body": {
                     "name": {
                         "value": "getServiced",
@@ -246,6 +248,7 @@
             },
             {
                 "type": "operation",
+                "name": "reloadAll",
                 "body": {
                     "name": {
                         "value": "reloadAll",
@@ -329,6 +332,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "default",
                 "body": {
                     "name": {
                         "value": "default",

test/syntax/baseline/getter-setter.json

@@ -41,6 +41,7 @@
             },
             {
                 "type": "operation",
+                "name": "",
                 "body": {
                     "name": null,
                     "idlType": {
@@ -104,6 +105,7 @@
             },
             {
                 "type": "operation",
+                "name": "",
                 "body": {
                     "name": null,
                     "idlType": {

test/syntax/baseline/identifier-qualified-names.json

@@ -34,6 +34,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "createObject",
                 "body": {
                     "name": {
                         "value": "createObject",
@@ -98,6 +99,7 @@
             },
             {
                 "type": "operation",
+                "name": "",
                 "body": {
                     "name": null,
                     "idlType": {
@@ -255,6 +257,7 @@
         "members": [
             {
                 "type": "operation",
+                "name": "addEventListener",
                 "body": {
                     "name": {
                         "value": "addEventListener",

test/syntax/baseline/indexed-properties.json

@@ -41,6 +41,7 @@
             },
             {
                 "type": "operation",
+                "name": "getByIndex",
                 "body": {
                     "name": {
                         "value": "getByIndex",
@@ -111,6 +112,7 @@
             },
             {
                 "type": "operation",
+                "name": "setByIndex",
                 "body": {
                     "name": {
                         "value": "setByIndex",
@@ -211,6 +213,7 @@
             },
             {
                 "type": "operation",
+                "name": "removeByIndex",
                 "body": {
                     "name": {
                         "value": "removeByIndex",
@@ -281,6 +284,7 @@
             },
             {
                 "type": "operation",
+                "name": "get",
                 "body": {
                     "name": {
                         "value": "get",
@@ -348,6 +352,7 @@
             },
             {
                 "type": "operation",
+                "name": "set",
                 "body": {
                     "name": {
                         "value": "set",
@@ -445,6 +450,7 @@
             },
             {
                 "type": "operation",
+                "name": "remove",
                 "body": {
                     "name": {
                         "value": "remove",