Revert "Implement support for the [Exposed] extended attribute (#192)"

This reverts commit 464a43f as part of rollback to before recent breaking changes, so we can make a new v15 release.
jsdom · Apr 18, 2020 · fc9fc6d · fc9fc6d
1 parent 1ea0bf6
commit fc9fc6d
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 463 deletions.
diff --git a/README.md b/README.md
@@ -264,12 +264,10 @@ Performs the Web IDL conversion algorithm for this interface, converting _value_
 
 In practice, this means doing a type-check equivalent to `is(value)`, and if it passes, returns the corresponding impl. If the type-check fails, it throws an informative exception. _context_ can be used to describe the provided value in any resulting error message.
 
-#### `install(globalObject, globalNames)`
+#### `install(globalObject)`
 
 This method creates a brand new wrapper constructor and prototype and attach it to the passed `globalObject`. It also registers the created constructor with the `globalObject`'s global constructor registry, which makes `create()`, `createImpl()`, and `setup()` work. (Thus, it is important to invoke `install()` before invoking those methods, as otherwise they will throw.)
 
-The second argument `globalNames` is an array containing the [global names](https://heycam.github.io/webidl/#dfn-global-name) of the interface that `globalObject` implements. This is used for the purposes of deciding which interfaces are [exposed](https://heycam.github.io/webidl/#dfn-exposed). For example, this array should be `["Window"]` for a [`Window`](https://html.spec.whatwg.org/multipage/window-object.html#window) global object. But for a [`DedicatedWorkerGlobalScope`](https://html.spec.whatwg.org/multipage/workers.html#dedicatedworkerglobalscope) global object, this array should be `["Worker", "DedicatedWorker"]`. Note that we do not yet implement [`[SecureContext]`](https://heycam.github.io/webidl/#SecureContext), so the "exposed" check is not fully implemented.
-
 #### `create(globalObject, constructorArgs, privateData)`
 
 Creates a new instance of the wrapper class and corresponding implementation class, passing in the `globalObject`, the `constructorArgs` array and `privateData` object to the implementation class constructor. Then returns the wrapper class.
@@ -456,7 +454,6 @@ webidl2js is implementing an ever-growing subset of the Web IDL specification. S
 - Variadic arguments
 - `[Clamp]`
 - `[EnforceRange]`
-- `[Exposed]`
 - `[LegacyArrayClass]`
 - `[LegacyUnenumerableNamedProperties]`
 - `[LegacyWindowAlias]`
@@ -481,6 +478,7 @@ Notable missing features include:
 - `[AllowShared]`
 - `[Default]` (for `toJSON()` operations)
 - `[Global]`'s various consequences, including the named properties object and `[[SetPrototypeOf]]`
+- `[Exposed]`
 - `[LenientSetter]`
 - `[LenientThis]`
 - `[NamedConstructor]`

diff --git a/lib/constructs/callback-interface.js b/lib/constructs/callback-interface.js
@@ -20,25 +20,6 @@ class CallbackInterface {
 
     this._analyzed = false;
     this._outputStaticProperties = new Map();
-
-    const exposed = utils.getExtAttr(this.idl.extAttrs, "Exposed");
-    if (this.idl.members.some(member => member.type === "const") && !exposed) {
-      throw new Error(`Callback interface ${this.name} with defined constants lacks the [Exposed] extended attribute`);
-    }
-
-    if (exposed) {
-      if (!exposed.rhs || (exposed.rhs.type !== "identifier" && exposed.rhs.type !== "identifier-list")) {
-        throw new Error(`[Exposed] must take an identifier or an identifier list in callback interface ${this.name}`);
-      }
-
-      if (exposed.rhs.type === "identifier") {
-        this.exposed = new Set([exposed.rhs.value]);
-      } else {
-        this.exposed = new Set(exposed.rhs.value.map(token => token.value));
-      }
-    } else {
-      this.exposed = new Set();
-    }
   }
 
   _analyzeMembers() {
@@ -197,24 +178,14 @@ class CallbackInterface {
   }
 
   generateInstall() {
-    if (this.constants.size > 0) {
-      this.str += `
-        const exposed = new Set(${JSON.stringify([...this.exposed])});
-      `;
-    }
-
     this.str += `
-      exports.install = (globalObject, globalNames) => {
+      exports.install = function install(globalObject) {
     `;
 
     if (this.constants.size > 0) {
       const { name } = this;
 
       this.str += `
-        if (!globalNames.some(globalName => exposed.has(globalName))) {
-          return;
-        }
-
         const ${name} = () => {
           throw new TypeError("Illegal invocation");
         };
@@ -263,6 +234,4 @@ class CallbackInterface {
   }
 }
 
-CallbackInterface.prototype.type = "callback interface";
-
 module.exports = CallbackInterface;
diff --git a/lib/constructs/interface.js b/lib/constructs/interface.js
@@ -1463,12 +1463,7 @@ class Interface {
     const { idl, name } = this;
 
     this.str += `
-      const exposed = new Set(${JSON.stringify([...this.exposed])});
-
-      exports.install = (globalObject, globalNames) => {
-        if (!globalNames.some(globalName => exposed.has(globalName))) {
-          return;
-        }
+      exports.install = (globalObject, globalName) => {
     `;
 
     if (idl.inheritance) {
@@ -1505,7 +1500,7 @@ class Interface {
 
       if (this.legacyWindowAliases) {
         this.str += `
-          if (globalNames.includes("Window")) {
+          if (globalName === "Window") {
         `;
 
         for (const legacyWindowAlias of this.legacyWindowAliases) {