Merge pull request #525 from webcomponents/update-typescript

Update TypeScript and upstream internal changes.

Author: bicknellr

package-lock.json

@@ -20,13 +20,13 @@
   },
   "devDependencies": {
     "@gulp-sourcemaps/sources-content": "^1.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.37.0",
+    "@typescript-eslint/parser": "^5.37.0",
     "babel-core": "^6.26.3",
     "chokidar-cli": "^2.1.0",
     "del": "^3.0.0",
-    "eslint": "^7.18.0",
-    "eslint-plugin-html": "^6.1.1",
+    "eslint": "^8.23.1",
+    "eslint-plugin-html": "^7.1.0",
     "google-closure-compiler": "^20210202.0.0",
     "gulp": "^4.0.0",
     "gulp-babel": "^7.0.1",
@@ -44,7 +44,7 @@
     "rollup-plugin-babel": "^3.0.7",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-license": "^0.8.1",
-    "typescript": "^4.0.3",
+    "typescript": "^4.8.3",
     "wct-browser-legacy": "^1.0.2",
     "web-component-tester": "^6.9.2"
   },

package.json

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 - Don't write to window.CustomElementsRegistry unless we're also writing to window.customElements. ([#524](https://github.com/webcomponents/polyfills/pull/524))
+- Update TypeScript and upstream internal changes.
+  ([#525](https://github.com/webcomponents/polyfills/pull/525))
 
 ## [1.5.0] - 2021-08-02
 

packages/custom-elements/CHANGELOG.md

@@ -280,7 +280,7 @@ export default class CustomElementInternals {
       if (definition) {
         this._upgradeAnElement(element, definition);
       }
-    } catch (e) {
+    } catch (e: unknown) {
       this.reportTheException(e);
     }
   }
@@ -340,7 +340,7 @@ export default class CustomElementInternals {
     if (definition.connectedCallback) {
       try {
         definition.connectedCallback.call(element);
-      } catch (e) {
+      } catch (e: unknown) {
         this.reportTheException(e);
       }
     }
@@ -351,7 +351,7 @@ export default class CustomElementInternals {
     if (definition.disconnectedCallback) {
       try {
         definition.disconnectedCallback.call(element);
-      } catch (e) {
+      } catch (e: unknown) {
         this.reportTheException(e);
       }
     }
@@ -377,7 +377,7 @@ export default class CustomElementInternals {
           newValue,
           namespace
         );
-      } catch (e) {
+      } catch (e: unknown) {
         this.reportTheException(e);
       }
     }
@@ -413,9 +413,7 @@ export default class CustomElementInternals {
       return;
     }
 
-    return (registry as CustomElementRegistry).internal_localNameToDefinition(
-      localName
-    );
+    return registry.internal_localNameToDefinition(localName);
   }
 
   /**
@@ -436,7 +434,7 @@ export default class CustomElementInternals {
     // Only create custom elements if the document is associated with a
     // registry.
     if (registry && (namespace === null || namespace === NS_HTML)) {
-      const definition = (registry as CustomElementRegistry).internal_localNameToDefinition(
+      const definition = ((registry as unknown) as CustomElementRegistry).internal_localNameToDefinition(
         localName
       );
       if (definition) {
@@ -507,7 +505,7 @@ export default class CustomElementInternals {
           }
 
           return result;
-        } catch (e) {
+        } catch (e: unknown) {
           this.reportTheException(e);
 
           // When construction fails, a new HTMLUnknownElement is produced.
@@ -539,7 +537,7 @@ export default class CustomElementInternals {
    *
    * @see https://html.spec.whatwg.org/multipage/webappapis.html#report-the-exception
    */
-  reportTheException(errorArg: Error) {
+  reportTheException(arg: unknown) {
     interface ExtendedError extends Error {
       // Non-standard Safari properties.
       sourceURL?: string;
@@ -552,11 +550,20 @@ export default class CustomElementInternals {
       columnNumber?: number;
     }
 
-    const error = errorArg as ExtendedError;
-    const message = error.message;
-    const filename = error.sourceURL || error.fileName || '';
-    const lineno = error.line || error.lineNumber || 0;
-    const colno = error.column || error.columnNumber || 0;
+    let message = '';
+    let filename = '';
+    let lineno = 0;
+    let colno = 0;
+
+    if (arg instanceof Error) {
+      const error = arg as ExtendedError;
+      message = error.message;
+      filename = error.sourceURL || error.fileName || '';
+      lineno = error.line || error.lineNumber || 0;
+      colno = error.column || error.columnNumber || 0;
+    } else {
+      message = `Uncaught ${String(arg)}`;
+    }
 
     let event: ErrorEvent | undefined = undefined;
     if (ErrorEvent.prototype.initErrorEvent === undefined) {
@@ -566,7 +573,7 @@ export default class CustomElementInternals {
         filename,
         lineno,
         colno,
-        error,
+        error: arg,
       });
     } else {
       event = document.createEvent('ErrorEvent') as ErrorEvent;
@@ -589,7 +596,7 @@ export default class CustomElementInternals {
         configurable: true,
         enumerable: true,
         get: function () {
-          return error;
+          return arg;
         },
       });
     }
@@ -600,7 +607,7 @@ export default class CustomElementInternals {
       // console if their associated ErrorEvent isn't handled during dispatch
       // (indicated by calling `preventDefault`). In practice, these errors are
       // always displayed.
-      console.error(error);
+      console.error(arg);
     }
   }
 }

packages/custom-elements/ts_src/CustomElementInternals.ts

@@ -335,7 +335,7 @@ export default class CustomElementRegistry {
       this._localNameToConstructorGetter.delete(localName);
       try {
         return this.internal_reifyDefinition(localName, constructorGetter());
-      } catch (e) {
+      } catch (e: unknown) {
         this._internals.reportTheException(e);
       }
     }

packages/custom-elements/ts_src/CustomElementRegistry.ts

@@ -11,7 +11,6 @@
 
 import AlreadyConstructedMarker from '../AlreadyConstructedMarker.js';
 import CustomElementInternals from '../CustomElementInternals.js';
-import CustomElementRegistry from '../CustomElementRegistry.js';
 import CEState from '../CustomElementState.js';
 import * as Native from './Native.js';
 
@@ -25,9 +24,7 @@ export default function (internals: CustomElementInternals) {
 
     // Always look up the definition from the global registry.
     const registry = document.__CE_registry!;
-    const definition = (registry as CustomElementRegistry).internal_constructorToDefinition(
-      constructor
-    );
+    const definition = registry.internal_constructorToDefinition(constructor);
     if (!definition) {
       throw new Error(
         'Failed to construct a custom element: ' +

packages/custom-elements/ts_src/Patch/HTMLElement.ts

@@ -9,9 +9,7 @@
  * rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
-// When building externally, this file is always assumed to be a module, but by
-// default it isn't when building internally, so we need this export statement.
-export {};
+import CustomElementRegistry from './CustomElementRegistry.js';
 
 declare global {
   interface AlreadyConstructedMarkerType {

packages/custom-elements/ts_src/env.d.ts

@@ -9,7 +9,10 @@
  * additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
-export const constructor = window.Event;
+// Without this explicit type, TS seems to think that `window.Event` is the
+// wrapper from `wrappers/event.ts` at this point, which is typed in terms of
+// this binding, causing a cycle in its type.
+export const constructor: typeof Event = window.Event;
 
 export const prototype = constructor.prototype;
 

packages/formdata-event/ts_src/environment/event.ts

@@ -37,11 +37,11 @@ export const getEventPropagationImmediatelyStopped = (e: Event) => {
 // const s = new SpecialEvent("type");
 // console.assert(s instanceof SpecialEvent); // fails in Safari 13.1
 // ```
-export const Event: typeof window.Event = (function Event(
+export const Event: typeof EventConstructor = (function Event(
   this: Event,
   type: string,
   eventInit: EventInit = {}
-) {
+): Event {
   let _this;
   // When running in a browser where Event isn't constructible (e.g. IE11) this
   // throws and we fall back to the old `createEvent` API.
@@ -53,7 +53,7 @@ export const Event: typeof window.Event = (function Event(
   }
   Object.setPrototypeOf(_this, Object.getPrototypeOf(this));
   return _this;
-} as Function) as typeof window.Event;
+} as unknown) as typeof EventConstructor;
 
 prepareWrapper(Event, EventConstructor, EventPrototype);
 

packages/formdata-event/ts_src/wrappers/event.ts

@@ -60,7 +60,7 @@ if (!window.Event || (isIE && typeof window.Event !== 'function')) {
 
 // CustomEvent constructor shim
 if (!window.CustomEvent || (isIE && typeof window.CustomEvent !== 'function')) {
-  window['CustomEvent'] = ((<T extends unknown>(
+  window['CustomEvent'] = ((<T>(
     inType: string,
     params?: CustomEventInit<T>
   ) => {