Update dependencies and dev dependencies

domenic · domenic · commit f60e95ae935e · 2021-09-11T21:21:26.000-04:00
This notably includes updates for void → undefined, and causes us to start requiring Node.js v12 since the webidl-conversions dependency now does. Closes #249.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10, 12, 14, 15]
+        node-version: [12, 14, 16]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
diff --git a/lib/constructs/callback-function.js b/lib/constructs/callback-function.js
@@ -30,7 +30,7 @@ class CallbackFunction {
       `;
 
     let returnIDL = "";
-    if (idl.idlType.idlType !== "void") {
+    if (idl.idlType.idlType !== "undefined") {
       const conv = Types.generateTypeConversion(this.ctx, "callResult", idl.idlType, [], this.name, "context");
       this.requires.merge(conv.requires);
       returnIDL = `
diff --git a/lib/constructs/callback-interface.js b/lib/constructs/callback-interface.js
@@ -139,7 +139,7 @@ class CallbackInterface {
             let callResult = Reflect.apply(X, thisArg, [${argNames.join(", ")}]);
     `;
 
-    if (operation.idlType.idlType !== "void") {
+    if (operation.idlType.idlType !== "undefined") {
       const conv = Types.generateTypeConversion(this.ctx, "callResult", operation.idlType, [], name, "context");
       this.requires.merge(conv.requires);
       this.str += `
diff --git a/lib/context.js b/lib/context.js
@@ -11,7 +11,7 @@ const builtinTypes = webidl.parse(`
   typedef unsigned long long DOMTimeStamp;
 
   callback Function = any (any... arguments);
-  callback VoidFunction = void ();
+  callback VoidFunction = undefined ();
 `);
 
 function defaultProcessor(code) {
diff --git a/lib/types.js b/lib/types.js
@@ -140,12 +140,7 @@ function generateTypeConversion(
   } else if (idlType.generic === "FrozenArray") {
     // frozen array type
     generateFrozenArray();
-  } else if (
-    // TODO: Revert once `Function` and `VoidFunction` are removed from `webidl-conversions`:
-    idlType.idlType !== "Function" &&
-    idlType.idlType !== "VoidFunction" &&
-    conversions[idlType.idlType]
-  ) {
+  } else if (conversions[idlType.idlType]) {
     // string or number type compatible with webidl-conversions
     generateGeneric(`conversions["${idlType.idlType}"]`);
   } else if (resolvedTypes.has(ctx.typeOf(idlType.idlType))) {
diff --git a/package.json b/package.json
@@ -8,14 +8,14 @@
   ],
   "repository": "github:jsdom/webidl2js",
   "dependencies": {
-    "prettier": "^2.2.1",
-    "webidl-conversions": "^6.1.0",
-    "webidl2": "^23.13.1"
+    "prettier": "^2.4.0",
+    "webidl-conversions": "^7.0.0",
+    "webidl2": "^24.1.2"
   },
   "devDependencies": {
-    "@domenic/eslint-config": "^1.1.0",
-    "eslint": "^7.21.0",
-    "jest": "^26.6.3"
+    "@domenic/eslint-config": "^1.3.0",
+    "eslint": "^7.32.0",
+    "jest": "^27.1.1"
   },
   "scripts": {
     "test": "jest",
@@ -29,7 +29,7 @@
     ]
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "author": "Sebastian Mayr <npm@smayr.name>",
   "license": "MIT"
diff --git a/test/cases/BufferSourceTypes.webidl b/test/cases/BufferSourceTypes.webidl
@@ -1,10 +1,10 @@
 [Exposed=Window]
 interface BufferSourceTypes {
-  void bs(BufferSource source);
-  void ab(ArrayBuffer ab);
-  void abv(ArrayBufferView abv);
-  void u8a(Uint8Array u8);
+  undefined bs(BufferSource source);
+  undefined ab(ArrayBuffer ab);
+  undefined abv(ArrayBufferView abv);
+  undefined u8a(Uint8Array u8);
 
-  void abUnion((ArrayBuffer or DOMString) ab);
-  void u8aUnion((Uint8Array or DOMString) ab);
+  undefined abUnion((ArrayBuffer or DOMString) ab);
+  undefined u8aUnion((Uint8Array or DOMString) ab);
 };
diff --git a/test/cases/CEReactions.webidl b/test/cases/CEReactions.webidl
@@ -1,11 +1,11 @@
 [Exposed=Window]
 interface CEReactions {
     [CEReactions] attribute DOMString attr;
-    [CEReactions] void method();
+    [CEReactions] undefined method();
 
     getter DOMString (DOMString name);
-    [CEReactions] setter void (DOMString name, DOMString value);
-    [CEReactions] deleter void (DOMString name);
+    [CEReactions] setter undefined (DOMString name, DOMString value);
+    [CEReactions] deleter undefined (DOMString name);
 
     [CEReactions] Promise<void> promiseOperation();
     [CEReactions] readonly attribute Promise<void> promiseAttribute;
diff --git a/test/cases/Enum.webidl b/test/cases/Enum.webidl
@@ -1,5 +1,5 @@
 [Exposed=Window]
 interface Enum {
-  void op(RequestDestination destination);
+  undefined op(RequestDestination destination);
   attribute RequestDestination attr;
 };
diff --git a/test/cases/EventListener.webidl b/test/cases/EventListener.webidl
@@ -1,3 +1,3 @@
 callback interface EventListener {
-  void handleEvent(Event event);
+  undefined handleEvent(Event event);
 };
diff --git a/test/cases/EventTarget.webidl b/test/cases/EventTarget.webidl
@@ -4,7 +4,7 @@
 interface EventTarget {
   constructor();
 
-  void addEventListener(DOMString type, EventListener? callback);
-  // void removeEventListener(DOMString type, EventListener? callback);
+  undefined addEventListener(DOMString type, EventListener? callback);
+  // undefined removeEventListener(DOMString type, EventListener? callback);
   // boolean dispatchEvent(Event event);
 };
diff --git a/test/cases/Global.webidl b/test/cases/Global.webidl
@@ -1,14 +1,14 @@
 [Global=Global,Exposed=Global]
 interface Global {
-  void op();
-  [LegacyUnforgeable] void unforgeableOp();
+  undefined op();
+  [LegacyUnforgeable] undefined unforgeableOp();
   attribute DOMString attr;
   [LegacyUnforgeable] attribute DOMString unforgeableAttr;
 
   getter DOMString (unsigned long index);
   attribute unsigned long length;
   iterable<DOMString>;
 
-  static void staticOp();
+  static undefined staticOp();
   static attribute DOMString staticAttr;
 };
diff --git a/test/cases/LegacyUnforgeable.webidl b/test/cases/LegacyUnforgeable.webidl
@@ -3,5 +3,5 @@ interface LegacyUnforgeable {
   [LegacyUnforgeable] stringifier attribute USVString href;
   [LegacyUnforgeable] readonly attribute USVString origin;
   [LegacyUnforgeable] attribute USVString protocol;
-  [LegacyUnforgeable] void assign(USVString url);
+  [LegacyUnforgeable] undefined assign(USVString url);
 };
diff --git a/test/cases/PromiseTypes.webidl b/test/cases/PromiseTypes.webidl
@@ -1,7 +1,7 @@
 [Exposed=Window]
 interface PromiseTypes {
-  void voidPromiseConsumer(Promise<void> p);
-  void promiseConsumer(Promise<double> p);
+  undefined voidPromiseConsumer(Promise<void> p);
+  undefined promiseConsumer(Promise<double> p);
 
   Promise<void> promiseOperation();
   readonly attribute Promise<void> promiseAttribute;
diff --git a/test/cases/SeqAndRec.webidl b/test/cases/SeqAndRec.webidl
@@ -2,9 +2,9 @@
 interface SeqAndRec {
   constructor();
 
-  void recordConsumer(record<USVString, double> rec);
-  void recordConsumer2(record<USVString, URL> rec);
-  void sequenceConsumer(sequence<USVString> seq);
-  void sequenceConsumer2(sequence<UnknownInterface> seq);
-  void frozenArrayConsumer(FrozenArray<double> arr);
+  undefined recordConsumer(record<USVString, double> rec);
+  undefined recordConsumer2(record<USVString, URL> rec);
+  undefined sequenceConsumer(sequence<USVString> seq);
+  undefined sequenceConsumer2(sequence<UnknownInterface> seq);
+  undefined frozenArrayConsumer(FrozenArray<double> arr);
 };
diff --git a/test/cases/Storage.webidl b/test/cases/Storage.webidl
@@ -4,7 +4,7 @@ interface Storage {
   readonly attribute unsigned long length;
   DOMString? key(unsigned long index);
   getter DOMString? getItem(DOMString key);
-  setter void setItem(DOMString key, DOMString value);
-  deleter void removeItem(DOMString key);
-  void clear();
+  setter undefined setItem(DOMString key, DOMString value);
+  deleter undefined removeItem(DOMString key);
+  undefined clear();
 };
diff --git a/test/cases/TypedefsAndUnions.webidl b/test/cases/TypedefsAndUnions.webidl
@@ -1,14 +1,14 @@
 [Exposed=Window]
 interface TypedefsAndUnions {
-  void numOrStrConsumer(NumOrStr a);
-  void numOrEnumConsumer((double or RequestDestination)? a);
-  void numOrStrOrNullConsumer(NumOrStrOrNull a);
-  void numOrStrOrURLOrNullConsumer(NumOrStrOrURLOrNull? a);
-  void urlMapInnerConsumer(URLMapInner a);
-  void urlMapConsumer(URLMap a);
-  void bufferSourceOrURLConsumer((BufferSource or URL) b);
-  void arrayBufferViewOrURLMapConsumer((ArrayBufferView or URLMap) b);
-  void arrayBufferViewDupConsumer((ArrayBufferView or Uint8ClampedArray) b);
+  undefined numOrStrConsumer(NumOrStr a);
+  undefined numOrEnumConsumer((double or RequestDestination)? a);
+  undefined numOrStrOrNullConsumer(NumOrStrOrNull a);
+  undefined numOrStrOrURLOrNullConsumer(NumOrStrOrURLOrNull? a);
+  undefined urlMapInnerConsumer(URLMapInner a);
+  undefined urlMapConsumer(URLMap a);
+  undefined bufferSourceOrURLConsumer((BufferSource or URL) b);
+  undefined arrayBufferViewOrURLMapConsumer((ArrayBufferView or URLMap) b);
+  undefined arrayBufferViewDupConsumer((ArrayBufferView or Uint8ClampedArray) b);
 
   attribute (ArrayBuffer or Uint8Array or Uint16Array) buf;
   attribute DOMTimeStamp time;
diff --git a/test/cases/URLSearchParams.webidl b/test/cases/URLSearchParams.webidl
@@ -2,14 +2,14 @@
 interface URLSearchParams {
   constructor(optional (sequence<sequence<USVString>> or record<USVString, USVString> or USVString) init = "");
 
-  void append(USVString name, USVString value);
-  void delete(USVString name);
+  undefined append(USVString name, USVString value);
+  undefined delete(USVString name);
   USVString? get(USVString name);
   sequence<USVString> getAll(USVString name);
   boolean has(USVString name);
-  void set(USVString name, USVString value);
+  undefined set(USVString name, USVString value);
 
-  void sort();
+  undefined sort();
 
   iterable<USVString, USVString>;
   stringifier;
diff --git a/test/cases/URLSearchParamsCollection2.webidl b/test/cases/URLSearchParamsCollection2.webidl
@@ -1,4 +1,4 @@
 [Exposed=Window]
 interface URLSearchParamsCollection2 : URLSearchParamsCollection {
-  setter void (DOMString key, URL value);
+  setter undefined (DOMString key, URL value);
 };
diff --git a/test/cases/UnderscoredProperties.webidl b/test/cases/UnderscoredProperties.webidl
@@ -3,6 +3,6 @@
 interface _UnderscoredProperties {
   const byte _const = 42;
   attribute byte _attribute;
-  static void _static(DOMString _void);
-  void _operation(sequence<DOMString> _sequence);
+  static undefined _static(DOMString _void);
+  undefined _operation(sequence<DOMString> _sequence);
 };
diff --git a/test/cases/Variadic.webidl b/test/cases/Variadic.webidl
@@ -1,16 +1,16 @@
 [Exposed=Window]
 interface Variadic {
-  void simple1(DOMString... strings);
+  undefined simple1(DOMString... strings);
 
-  void simple2(DOMString first, URL... urls);
+  undefined simple2(DOMString first, URL... urls);
 
   // This is handled in a broken way, with no conversions. It is included here just so we can track any behavior changes
   // to the broken implementation over time.
-  void overloaded1(DOMString... strings);
-  void overloaded1(unsigned long... numbers);
+  undefined overloaded1(DOMString... strings);
+  undefined overloaded1(unsigned long... numbers);
 
   // This is handled in an extra-broken way, with a random conversion of the second argument to a DOMString, but no
   // subsequent arguments. Again, it is included here just so we can track changes over time.
-  void overloaded2(DOMString first, DOMString... strings);
-  void overloaded2(unsigned long first, DOMString... strings);
+  undefined overloaded2(DOMString first, DOMString... strings);
+  undefined overloaded2(unsigned long first, DOMString... strings);
 };
diff --git a/yarn.lock b/yarn.lock
