fixup! lib: refactor internal webidl converters

Signed-off-by: Filip Skokan <panva.ip@gmail.com>

Author: panva

lib/internal/webidl.js

@@ -21,6 +21,7 @@ const {
   NumberMAX_SAFE_INTEGER,
   NumberMIN_SAFE_INTEGER,
   ObjectPrototypeIsPrototypeOf,
+  SafeArrayIterator,
   SafeSet,
   String,
   SymbolIterator,
@@ -357,10 +358,10 @@ function convertToInt(
       if (integer === V) {
         return V === 0 ? 0 : V;
       }
-      if (options === kEmptyObject || options.enforceRange || !options.clamp) {
-        return integer === 0 ? 0 : integer;
+      if (options !== kEmptyObject && options.clamp) {
+        return evenRound(V);
       }
-      return evenRound(V);
+      return integer === 0 ? 0 : integer;
     }
     if (options !== kEmptyObject && options.enforceRange) {
       // Keep [EnforceRange] ahead of [Clamp] without falling through to
@@ -604,7 +605,7 @@ function requiredArguments(length, required, options = kEmptyObject) {
  * @returns {Converter}
  */
 function createEnumConverter(name, values) {
-  const E = new SafeSet(values);
+  const E = new SafeSet(new SafeArrayIterator(values));
 
   return function(V, options = kEmptyObject) {
     // Web IDL enumeration step 1: convert V with ToString.

test/parallel/test-internal-webidl-converttoint.js

@@ -267,40 +267,6 @@ assert.throws(() => convertToInt(256, 8, 'unsigned', {
   code: 'ERR_OUT_OF_RANGE',
 });
 
-{
-  const calls = [];
-  const options = {
-    get enforceRange() {
-      calls.push('enforceRange');
-      return true;
-    },
-    get clamp() {
-      calls.push('clamp');
-      return true;
-    },
-  };
-
-  assert.strictEqual(convertToInt(1.5, 8, 'unsigned', options), 1);
-  assert.deepStrictEqual(calls, ['enforceRange']);
-}
-
-{
-  const calls = [];
-  const options = {
-    get enforceRange() {
-      calls.push('enforceRange');
-      return true;
-    },
-    get clamp() {
-      calls.push('clamp');
-      return true;
-    },
-  };
-
-  assert.strictEqual(convertToInt(255.5, 8, 'unsigned', options), 255);
-  assert.deepStrictEqual(calls, ['enforceRange']);
-}
-
 {
   const calls = [];
   const options = {