Implement [LegacyLenientSetter] and fix [LegacyLenientThis]

For [LegacyLenientThis], this fixes an issue where it would still try to get the impl value, even when the thisArg did not pass the is() check, resulting in a TypeError. This also adds test coverage for [LegacyLenientThis] and [Replaceable], as part of #207.
jsdom · Apr 26, 2020 · 96a008e · 96a008e
1 parent a272dce
commit 96a008e
Show file tree

Hide file tree

Showing 5 changed files with 792 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -470,6 +470,7 @@ webidl2js is implementing an ever-growing subset of the Web IDL specification. S
 - `[EnforceRange]`
 - `[Exposed]`
 - `[LegacyLenientThis]`
+- `[LegacyLenientSetter]`
 - `[LegacyNoInterfaceObject]`
 - `[LegacyNullToEmptyString]`
 - `[LegacyOverrideBuiltins]`
@@ -494,7 +495,6 @@ Notable missing features include:
 - `[Default]` (for `toJSON()` operations)
 - `[Global]`'s various consequences, including the named properties object and `[[SetPrototypeOf]]`
 - `[LegacyFactoryFunction]`
-- `[LegacyLenientSetter]`
 - `[LegacyNamespace]`
 - `[LegacyTreatNonObjectAsNull]`
 - `[SecureContext]`

diff --git a/lib/constructs/attribute.js b/lib/constructs/attribute.js
@@ -48,8 +48,16 @@ class Attribute {
       setterBody = processedOutput.set;
     }
 
-    if (utils.getExtAttr(this.idl.extAttrs, "LegacyLenientThis")) {
-      brandCheck = "";
+    const replaceable = utils.getExtAttr(this.idl.extAttrs, "Replaceable");
+    const legacyLenientSetter = utils.getExtAttr(this.idl.extAttrs, "LegacyLenientSetter");
+    const legacyLenientThis = utils.getExtAttr(this.idl.extAttrs, "LegacyLenientThis");
+
+    if (legacyLenientThis) {
+      brandCheck = `
+        if (!exports.is(esValue)) {
+          return;
+        }
+      `;
     }
 
     if (sameObject) {
@@ -94,23 +102,47 @@ class Attribute {
         ${idlConversion}
         ${setterBody}
       `, "set", { configurable });
-    } else if (utils.getExtAttr(this.idl.extAttrs, "PutForwards")) {
-      addMethod(this.idl.name, ["V"], `
-        const esValue = this !== null && this !== undefined ? this : globalObject;
-        ${brandCheck}
-        this.${this.idl.name}.${utils.getExtAttr(this.idl.extAttrs, "PutForwards").rhs.value} = V;
-      `, "set", { configurable });
-    } else if (utils.getExtAttr(this.idl.extAttrs, "Replaceable")) {
-      addMethod(this.idl.name, ["V"], `
-        const esValue = this !== null && this !== undefined ? this : globalObject;
-        ${brandCheck}
-        Object.defineProperty(esValue, "${this.idl.name}", {
-          configurable: true,
-          enumerable: true,
-          value: V,
-          writable: true
-        });
-      `, "set", { configurable });
+    } else {
+      const putForwards = utils.getExtAttr(this.idl.extAttrs, "PutForwards");
+
+      setterBody = "";
+      if (replaceable) {
+        if (legacyLenientThis) {
+          brandCheck = "";
+        }
+
+        setterBody = `
+          Object.defineProperty(esValue, "${this.idl.name}", {
+            configurable: true,
+            enumerable: true,
+            value: V,
+            writable: true
+          });
+        `;
+      } else if (putForwards) {
+        setterBody = `
+          const Q = esValue["${this.idl.name}"];
+          if (!utils.isObject(Q)) {
+            throw new TypeError("Property '${this.idl.name}' is not an object");
+          }
+        `;
+
+        // WebIDL calls the `Set` abstract operation with a `Throw` value of `false`:
+        setterBody += `Reflect.set(Q, "${putForwards.rhs.value}", V);`;
+      }
+
+      if (setterBody) {
+        addMethod(this.idl.name, ["V"], `
+          const esValue = this !== null && this !== undefined ? this : globalObject;
+          ${brandCheck}
+          ${setterBody}
+        `, "set", { configurable });
+      } else if (legacyLenientSetter) {
+        addMethod(this.idl.name, ["V"], legacyLenientThis ? "" : `
+          const esValue = this !== null && this !== undefined ? this : globalObject;
+          ${brandCheck}
+        `, "set", { configurable });
+      }
     }
 
     if (!this.static && this.idl.special === "stringifier") {