chore: Updating dependencies to latest working versions

Author: fguitton

.gitignore

@@ -4,10 +4,12 @@
 /coverage/
 /test/web-platform-tests/
 /lib/*.json
+/lib/Function.js
 /lib/TextEncoder.js
 /lib/TextDecoder.js
 /lib/TextDecodeOptions.js
 /lib/TextDecoderOptions.js
 /lib/TextEncoderEncodeIntoResult.js
+/lib/VoidFunction.js
 /lib/utils.js
 /live-viewer/whatwg-encoding.js

index.js

@@ -3,9 +3,9 @@
 const { TextEncoder, TextDecoder } = require("./webidl2js-wrapper");
 const whatwgEncoding = require("./lib/whatwg-encoding");
 
-const sharedGlobalObject = {};
-TextEncoder.install(sharedGlobalObject);
-TextDecoder.install(sharedGlobalObject);
+const sharedGlobalObject = globalThis;
+TextEncoder.install(sharedGlobalObject, ["Window"]);
+TextDecoder.install(sharedGlobalObject, ["Window"]);
 
 exports.TextEncoder = sharedGlobalObject.TextEncoder;
 exports.TextDecoder = sharedGlobalObject.TextDecoder;

lib/TextDecoder.js

@@ -16,24 +16,24 @@ exports.is = value => {
 exports.isImpl = value => {
   return utils.isObject(value) && value instanceof Impl.implementation;
 };
-exports.convert = (value, { context = "The provided value" } = {}) => {
+exports.convert = (globalObject, value, { context = "The provided value" } = {}) => {
   if (exports.is(value)) {
     return utils.implForWrapper(value);
   }
-  throw new TypeError(`${context} is not of type 'TextDecoder'.`);
+  throw new globalObject.TypeError(`${context} is not of type 'TextDecoder'.`);
 };
 
-function makeWrapper(globalObject) {
-  if (globalObject[ctorRegistrySymbol] === undefined) {
-    throw new Error("Internal error: invalid global object");
+function makeWrapper(globalObject, newTarget) {
+  let proto;
+  if (newTarget !== undefined) {
+    proto = newTarget.prototype;
   }
 
-  const ctor = globalObject[ctorRegistrySymbol]["TextDecoder"];
-  if (ctor === undefined) {
-    throw new Error("Internal error: constructor TextDecoder is not installed on the passed global object");
+  if (!utils.isObject(proto)) {
+    proto = globalObject[ctorRegistrySymbol]["TextDecoder"].prototype;
   }
 
-  return Object.create(ctor.prototype);
+  return Object.create(proto);
 }
 
 exports.create = (globalObject, constructorArgs, privateData) => {
@@ -64,8 +64,8 @@ exports.setup = (wrapper, globalObject, constructorArgs = [], privateData = {})
   return wrapper;
 };
 
-exports.new = globalObject => {
-  const wrapper = makeWrapper(globalObject);
+exports.new = (globalObject, newTarget) => {
+  const wrapper = makeWrapper(globalObject, newTarget);
 
   exports._internalSetup(wrapper, globalObject);
   Object.defineProperty(wrapper, implSymbol, {
@@ -82,25 +82,32 @@ exports.new = globalObject => {
 
 const exposed = new Set(["Window", "Worker"]);
 
-exports.install = (globalObject, globalNames = ["Window"]) => {
+exports.install = (globalObject, globalNames) => {
   if (!globalNames.some(globalName => exposed.has(globalName))) {
     return;
   }
+
+  const ctorRegistry = utils.initCtorRegistry(globalObject);
   class TextDecoder {
     constructor() {
       const args = [];
       {
         let curArg = arguments[0];
         if (curArg !== undefined) {
-          curArg = conversions["DOMString"](curArg, { context: "Failed to construct 'TextDecoder': parameter 1" });
+          curArg = conversions["DOMString"](curArg, {
+            context: "Failed to construct 'TextDecoder': parameter 1",
+            globals: globalObject
+          });
         } else {
           curArg = "utf-8";
         }
         args.push(curArg);
       }
       {
         let curArg = arguments[1];
-        curArg = TextDecoderOptions.convert(curArg, { context: "Failed to construct 'TextDecoder': parameter 2" });
+        curArg = TextDecoderOptions.convert(globalObject, curArg, {
+          context: "Failed to construct 'TextDecoder': parameter 2"
+        });
         args.push(curArg);
       }
       return exports.setup(Object.create(new.target.prototype), globalObject, args);
@@ -109,7 +116,7 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
     decode() {
       const esValue = this !== null && this !== undefined ? this : globalObject;
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError("'decode' called on an object that is not a valid instance of TextDecoder.");
       }
       const args = [];
       {
@@ -118,7 +125,7 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
           if (utils.isArrayBuffer(curArg)) {
           } else if (ArrayBuffer.isView(curArg)) {
           } else {
-            throw new TypeError(
+            throw new globalObject.TypeError(
               "Failed to execute 'decode' on 'TextDecoder': parameter 1" + " is not of any supported type."
             );
           }
@@ -127,7 +134,7 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
       }
       {
         let curArg = arguments[1];
-        curArg = TextDecodeOptions.convert(curArg, {
+        curArg = TextDecodeOptions.convert(globalObject, curArg, {
           context: "Failed to execute 'decode' on 'TextDecoder': parameter 2"
         });
         args.push(curArg);
@@ -139,7 +146,9 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
       const esValue = this !== null && this !== undefined ? this : globalObject;
 
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError(
+          "'get encoding' called on an object that is not a valid instance of TextDecoder."
+        );
       }
 
       return esValue[implSymbol]["encoding"];
@@ -149,7 +158,9 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
       const esValue = this !== null && this !== undefined ? this : globalObject;
 
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError(
+          "'get fatal' called on an object that is not a valid instance of TextDecoder."
+        );
       }
 
       return esValue[implSymbol]["fatal"];
@@ -159,7 +170,9 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
       const esValue = this !== null && this !== undefined ? this : globalObject;
 
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError(
+          "'get ignoreBOM' called on an object that is not a valid instance of TextDecoder."
+        );
       }
 
       return esValue[implSymbol]["ignoreBOM"];
@@ -172,10 +185,7 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
     ignoreBOM: { enumerable: true },
     [Symbol.toStringTag]: { value: "TextDecoder", configurable: true }
   });
-  if (globalObject[ctorRegistrySymbol] === undefined) {
-    globalObject[ctorRegistrySymbol] = Object.create(null);
-  }
-  globalObject[ctorRegistrySymbol][interfaceName] = TextDecoder;
+  ctorRegistry[interfaceName] = TextDecoder;
 
   Object.defineProperty(globalObject, interfaceName, {
     configurable: true,

lib/TextEncoder.js

@@ -14,24 +14,24 @@ exports.is = value => {
 exports.isImpl = value => {
   return utils.isObject(value) && value instanceof Impl.implementation;
 };
-exports.convert = (value, { context = "The provided value" } = {}) => {
+exports.convert = (globalObject, value, { context = "The provided value" } = {}) => {
   if (exports.is(value)) {
     return utils.implForWrapper(value);
   }
-  throw new TypeError(`${context} is not of type 'TextEncoder'.`);
+  throw new globalObject.TypeError(`${context} is not of type 'TextEncoder'.`);
 };
 
-function makeWrapper(globalObject) {
-  if (globalObject[ctorRegistrySymbol] === undefined) {
-    throw new Error("Internal error: invalid global object");
+function makeWrapper(globalObject, newTarget) {
+  let proto;
+  if (newTarget !== undefined) {
+    proto = newTarget.prototype;
   }
 
-  const ctor = globalObject[ctorRegistrySymbol]["TextEncoder"];
-  if (ctor === undefined) {
-    throw new Error("Internal error: constructor TextEncoder is not installed on the passed global object");
+  if (!utils.isObject(proto)) {
+    proto = globalObject[ctorRegistrySymbol]["TextEncoder"].prototype;
   }
 
-  return Object.create(ctor.prototype);
+  return Object.create(proto);
 }
 
 exports.create = (globalObject, constructorArgs, privateData) => {
@@ -62,8 +62,8 @@ exports.setup = (wrapper, globalObject, constructorArgs = [], privateData = {})
   return wrapper;
 };
 
-exports.new = globalObject => {
-  const wrapper = makeWrapper(globalObject);
+exports.new = (globalObject, newTarget) => {
+  const wrapper = makeWrapper(globalObject, newTarget);
 
   exports._internalSetup(wrapper, globalObject);
   Object.defineProperty(wrapper, implSymbol, {
@@ -80,10 +80,12 @@ exports.new = globalObject => {
 
 const exposed = new Set(["Window", "Worker"]);
 
-exports.install = (globalObject, globalNames = ["Window"]) => {
+exports.install = (globalObject, globalNames) => {
   if (!globalNames.some(globalName => exposed.has(globalName))) {
     return;
   }
+
+  const ctorRegistry = utils.initCtorRegistry(globalObject);
   class TextEncoder {
     constructor() {
       return exports.setup(Object.create(new.target.prototype), globalObject, undefined);
@@ -92,14 +94,15 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
     encode() {
       const esValue = this !== null && this !== undefined ? this : globalObject;
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError("'encode' called on an object that is not a valid instance of TextEncoder.");
       }
       const args = [];
       {
         let curArg = arguments[0];
         if (curArg !== undefined) {
           curArg = conversions["USVString"](curArg, {
-            context: "Failed to execute 'encode' on 'TextEncoder': parameter 1"
+            context: "Failed to execute 'encode' on 'TextEncoder': parameter 1",
+            globals: globalObject
           });
         } else {
           curArg = "";
@@ -112,28 +115,30 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
     encodeInto(source, destination) {
       const esValue = this !== null && this !== undefined ? this : globalObject;
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError(
+          "'encodeInto' called on an object that is not a valid instance of TextEncoder."
+        );
       }
 
       if (arguments.length < 2) {
-        throw new TypeError(
-          "Failed to execute 'encodeInto' on 'TextEncoder': 2 arguments required, but only " +
-            arguments.length +
-            " present."
+        throw new globalObject.TypeError(
+          `Failed to execute 'encodeInto' on 'TextEncoder': 2 arguments required, but only ${arguments.length} present.`
         );
       }
       const args = [];
       {
         let curArg = arguments[0];
         curArg = conversions["USVString"](curArg, {
-          context: "Failed to execute 'encodeInto' on 'TextEncoder': parameter 1"
+          context: "Failed to execute 'encodeInto' on 'TextEncoder': parameter 1",
+          globals: globalObject
         });
         args.push(curArg);
       }
       {
         let curArg = arguments[1];
         curArg = conversions["Uint8Array"](curArg, {
-          context: "Failed to execute 'encodeInto' on 'TextEncoder': parameter 2"
+          context: "Failed to execute 'encodeInto' on 'TextEncoder': parameter 2",
+          globals: globalObject
         });
         args.push(curArg);
       }
@@ -144,7 +149,9 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
       const esValue = this !== null && this !== undefined ? this : globalObject;
 
       if (!exports.is(esValue)) {
-        throw new TypeError("Illegal invocation");
+        throw new globalObject.TypeError(
+          "'get encoding' called on an object that is not a valid instance of TextEncoder."
+        );
       }
 
       return esValue[implSymbol]["encoding"];
@@ -156,10 +163,7 @@ exports.install = (globalObject, globalNames = ["Window"]) => {
     encoding: { enumerable: true },
     [Symbol.toStringTag]: { value: "TextEncoder", configurable: true }
   });
-  if (globalObject[ctorRegistrySymbol] === undefined) {
-    globalObject[ctorRegistrySymbol] = Object.create(null);
-  }
-  globalObject[ctorRegistrySymbol][interfaceName] = TextEncoder;
+  ctorRegistry[interfaceName] = TextEncoder;
 
   Object.defineProperty(globalObject, interfaceName, {
     configurable: true,

package.json

@@ -26,15 +26,15 @@
   },
   "dependencies": {
     "iconv-lite": "^0.6.3",
-    "webidl-conversions": "^6.1.0"
+    "webidl-conversions": "^7.0.0"
   },
   "devDependencies": {
-    "@domenic/eslint-config": "^1.3.0",
+    "@domenic/eslint-config": "^2.0.0",
     "browserify": "^17.0.0",
-    "eslint": "^7.32.0",
-    "got": "^9.0.0",
-    "jest": "^27.0.6",
-    "webidl2js": "^15.3.0"
+    "eslint": "^8.23.1",
+    "got": "^11.8.5",
+    "jest": "^29.0.3",
+    "webidl2js": "^17.1.0"
   },
   "engines": {
     "node": ">=12"

scripts/update.js

@@ -5,10 +5,11 @@ const path = require("path");
 const iconvLite = require("iconv-lite");
 const got = require("got");
 
-got("https://encoding.spec.whatwg.org/encodings.json", { json: true }).then(({ body }) => {
+got("https://encoding.spec.whatwg.org/encodings.json").then(({ body }) => {
   const labelsToNames = {};
   const supportedNames = [];
-  for (const entry of body) {
+  const parsedBody = JSON.parse(body);
+  for (const entry of parsedBody) {
     for (const encoding of entry.encodings) {
       if (iconvLite.encodingExists(encoding.name)) {
         supportedNames.push(encoding.name);

test/web-platform.js

@@ -13,7 +13,7 @@ function createSandbox() {
     TextEncoder,
     TextDecoder,
     // eslint-disable-next-line camelcase
-    encodings_table: encodingsTable
+    encodings_table: JSON.parse(encodingsTable)
   };
   Object.assign(sandbox, testharness);
   vm.createContext(sandbox);