feat(typescript): update to typescript 4.3.5

package.json

@@ -120,7 +120,7 @@
     "sizzle": "^2.3.6",
     "terser": "5.6.1",
     "tslib": "^2.1.0",
-    "typescript": "4.2.3",
+    "typescript": "4.3.5",
     "webpack": "^4.46.0",
     "ws": "7.4.6"
   },

src/compiler/sys/dependencies.json

@@ -50,6 +50,11 @@
         "compiler/lib.es2020.sharedmemory.d.ts",
         "compiler/lib.es2020.string.d.ts",
         "compiler/lib.es2020.symbol.wellknown.d.ts",
+        "compiler/lib.es2021.d.ts",
+        "compiler/lib.es2021.full.d.ts",
+        "compiler/lib.es2021.promise.d.ts",
+        "compiler/lib.es2021.string.d.ts",
+        "compiler/lib.es2021.weakref.d.ts",
         "compiler/lib.es5.d.ts",
         "compiler/lib.es6.d.ts",
         "compiler/lib.esnext.d.ts",

src/compiler/transformers/decorators-to-static/method-decorator.ts

@@ -5,6 +5,7 @@ import {
   createStaticGetter,
   getAttributeTypeInfo,
   isMemberPrivate,
+  mapJSDocTagInfo,
   serializeSymbol,
   typeToString,
   validateReferences,
@@ -95,7 +96,7 @@ const parseMethodDecorator = (
     },
     docs: {
       text: ts.displayPartsToString(signature.getDocumentationComment(typeChecker)),
-      tags: signature.getJsDocTags(),
+      tags: mapJSDocTagInfo(signature.getJsDocTags()),
     },
   };
   validateReferences(diagnostics, methodMeta.complexType.references, method.type || method.name);

src/compiler/transformers/test/transform-utils.spec.ts

@@ -0,0 +1,29 @@
+import { mapJSDocTagInfo } from '../transform-utils';
+
+describe('transform utils', () => {
+  it('flattens TypeScript JSDocTagInfo to Stencil JSDocTagInfo', () => {
+    const tags = [
+      {
+        name: 'param',
+        text: [
+          { kind: 'text', text: 'foo' },
+          { kind: 'space', text: ' ' },
+          { kind: 'text', text: 'the first parameter' },
+        ],
+      },
+      {
+        name: 'param',
+        text: [
+          { kind: 'text', text: 'bar' },
+          { kind: 'space', text: ' ' },
+          { kind: 'text', text: 'the second parameter' },
+        ],
+      },
+    ];
+
+    expect(mapJSDocTagInfo(tags)).toEqual([
+      { name: 'param', text: 'foo the first parameter' },
+      { name: 'param', text: 'bar the second parameter' },
+    ]);
+  });
+});

src/compiler/transformers/transform-utils.ts

@@ -515,11 +515,20 @@ export const serializeSymbol = (checker: ts.TypeChecker, symbol: ts.Symbol): d.C
     };
   }
   return {
-    tags: symbol.getJsDocTags().map((tag) => ({ text: tag.text, name: tag.name })),
+    tags: mapJSDocTagInfo(symbol.getJsDocTags()),
     text: ts.displayPartsToString(symbol.getDocumentationComment(checker)),
   };
 };
 
+/**
+ * Maps a TypeScript 4.3+ JSDocTagInfo to a flattened Stencil CompilerJsDocTagInfo.
+ * @param tags An array of JSDocTagInfo objects.
+ * @return An array of CompilerJsDocTagInfo objects.
+ */
+export const mapJSDocTagInfo = (tags: ts.JSDocTagInfo[]): d.CompilerJsDocTagInfo[] => {
+  return tags.map((tag) => ({ ...tag, text: tag.text?.map((part) => part.text).join('') }));
+};
+
 export const serializeDocsSymbol = (checker: ts.TypeChecker, symbol: ts.Symbol) => {
   const type = checker.getTypeOfSymbolAtLocation(symbol, symbol.valueDeclaration);
   const set = new Set<string>();

src/mock-doc/comment-node.ts

@@ -6,15 +6,15 @@ export class MockComment extends MockNode {
     super(ownerDocument, NODE_TYPES.COMMENT_NODE, NODE_NAMES.COMMENT_NODE, data);
   }
 
-  cloneNode(_deep?: boolean) {
+  override cloneNode(_deep?: boolean) {
     return new MockComment(null, this.nodeValue);
   }
 
-  get textContent() {
+  override get textContent() {
     return this.nodeValue;
   }
 
-  set textContent(text) {
+  override set textContent(text) {
     this.nodeValue = text;
   }
 }

src/mock-doc/document-fragment.ts

@@ -13,7 +13,7 @@ export class MockDocumentFragment extends MockHTMLElement {
     return getElementById(this, id);
   }
 
-  cloneNode(deep?: boolean) {
+  override cloneNode(deep?: boolean) {
     const cloned = new MockDocumentFragment(null);
 
     if (deep) {

src/mock-doc/document.ts

@@ -42,10 +42,10 @@ export class MockDocument extends MockHTMLElement {
     }
   }
 
-  get dir() {
+  override get dir() {
     return this.documentElement.dir;
   }
-  set dir(value: string) {
+  override set dir(value: string) {
     this.documentElement.dir = value;
   }
 
@@ -166,7 +166,7 @@ export class MockDocument extends MockHTMLElement {
     }
   }
 
-  appendChild(newNode: MockElement) {
+  override appendChild(newNode: MockElement) {
     newNode.remove();
     newNode.parentNode = this;
     this.childNodes.push(newNode);
@@ -222,14 +222,14 @@ export class MockDocument extends MockHTMLElement {
     return getElementsByName(this, elmName.toLowerCase());
   }
 
-  get title() {
+  override get title() {
     const title = this.head.childNodes.find((elm) => elm.nodeName === 'TITLE') as MockElement;
     if (title != null && typeof title.textContent === 'string') {
       return title.textContent.trim();
     }
     return '';
   }
-  set title(value: string) {
+  override set title(value: string) {
     const head = this.head;
     let title = head.childNodes.find((elm) => elm.nodeName === 'TITLE') as MockElement;
     if (title == null) {

src/mock-doc/element.ts

@@ -107,10 +107,10 @@ export class MockImageElement extends MockHTMLElement {
     super(ownerDocument, 'img');
   }
 
-  get draggable() {
+  override get draggable() {
     return this.getAttributeNS(null, 'draggable') !== 'false';
   }
-  set draggable(value: boolean) {
+  override set draggable(value: boolean) {
     this.setAttributeNS(null, 'draggable', value);
   }
 
@@ -243,24 +243,24 @@ export class MockStyleElement extends MockHTMLElement {
     this.sheet = new MockCSSStyleSheet(this);
   }
 
-  get innerHTML() {
+  override get innerHTML() {
     return getStyleElementText(this);
   }
-  set innerHTML(value: string) {
+  override set innerHTML(value: string) {
     setStyleElementText(this, value);
   }
 
-  get innerText() {
+  override get innerText() {
     return getStyleElementText(this);
   }
-  set innerText(value: string) {
+  override set innerText(value: string) {
     setStyleElementText(this, value);
   }
 
-  get textContent() {
+  override get textContent() {
     return getStyleElementText(this);
   }
-  set textContent(value: string) {
+  override set textContent(value: string) {
     setStyleElementText(this, value);
   }
 }
@@ -318,14 +318,14 @@ export class MockTemplateElement extends MockHTMLElement {
     this.content = new MockDocumentFragment(ownerDocument);
   }
 
-  get innerHTML() {
+  override get innerHTML() {
     return this.content.innerHTML;
   }
-  set innerHTML(html: string) {
+  override set innerHTML(html: string) {
     this.content.innerHTML = html;
   }
 
-  cloneNode(deep?: boolean) {
+  override cloneNode(deep?: boolean) {
     const cloned = new MockTemplateElement(null);
     cloned.attributes = cloneAttributes(this.attributes);
 

src/mock-doc/node.ts

@@ -66,7 +66,7 @@ export class MockNode {
     return -1;
   }
 
-  get firstChild() {
+  get firstChild(): MockNode | null {
     return this.childNodes[0] || null;
   }
 
@@ -103,11 +103,11 @@ export class MockNode {
     return this === node;
   }
 
-  get lastChild() {
+  get lastChild(): MockNode | null {
     return this.childNodes[this.childNodes.length - 1] || null;
   }
 
-  get nextSibling() {
+  get nextSibling(): MockNode | null {
     if (this.parentNode != null) {
       const index = this.parentNode.childNodes.indexOf(this) + 1;
       return this.parentNode.childNodes[index] || null;
@@ -129,7 +129,7 @@ export class MockNode {
     this.parentNode = value;
   }
 
-  get previousSibling() {
+  get previousSibling(): MockNode | null {
     if (this.parentNode != null) {
       const index = this.parentNode.childNodes.indexOf(this) - 1;
       return this.parentNode.childNodes[index] || null;
@@ -273,7 +273,7 @@ export class MockElement extends MockNode {
     dispatchEvent(this, new MockEvent('click', { bubbles: true, cancelable: true, composed: true }));
   }
 
-  cloneNode(_deep?: boolean): MockElement {
+  override cloneNode(_deep?: boolean): MockElement {
     // implemented on MockElement.prototype from within element.ts
     return null;
   }
@@ -304,7 +304,7 @@ export class MockElement extends MockNode {
     return dispatchEvent(this, ev);
   }
 
-  get firstElementChild() {
+  get firstElementChild(): MockElement | null {
     return this.children[0] || null;
   }
 
@@ -481,7 +481,7 @@ export class MockElement extends MockNode {
     this.setAttributeNS(null, 'lang', value);
   }
 
-  get lastElementChild() {
+  get lastElementChild(): MockElement | null {
     const children = this.children;
     return children[children.length - 1] || null;
   }
@@ -670,12 +670,12 @@ export class MockElement extends MockNode {
     this.nodeName = value;
   }
 
-  get textContent() {
+  override get textContent() {
     const text: string[] = [];
     getTextContent(this.childNodes, text);
     return text.join('');
   }
-  set textContent(value: string) {
+  override set textContent(value: string) {
     setTextContent(this, value);
   }
 
@@ -951,7 +951,7 @@ export class MockElement extends MockNode {
     /**/
   }
 
-  toString(opts?: SerializeNodeToHtmlOptions) {
+  override toString(opts?: SerializeNodeToHtmlOptions) {
     return serializeNodeToHtml(this as any, opts);
   }
 }
@@ -1011,26 +1011,26 @@ function insertBefore(parentNode: MockNode, newNode: MockNode, referenceNode: Mo
 }
 
 export class MockHTMLElement extends MockElement {
-  namespaceURI = 'http://www.w3.org/1999/xhtml';
+  override namespaceURI = 'http://www.w3.org/1999/xhtml';
 
   constructor(ownerDocument: any, nodeName: string) {
     super(ownerDocument, typeof nodeName === 'string' ? nodeName.toUpperCase() : null);
   }
 
-  get tagName() {
+  override get tagName() {
     return this.nodeName;
   }
-  set tagName(value: string) {
+  override set tagName(value: string) {
     this.nodeName = value;
   }
 
-  get attributes() {
+  override get attributes() {
     if (this.__attributeMap == null) {
       this.__attributeMap = createAttributeProxy(true);
     }
     return this.__attributeMap;
   }
-  set attributes(attrs: MockAttributeMap) {
+  override set attributes(attrs: MockAttributeMap) {
     this.__attributeMap = attrs;
   }
 }
@@ -1040,14 +1040,14 @@ export class MockTextNode extends MockNode {
     super(ownerDocument, NODE_TYPES.TEXT_NODE, NODE_NAMES.TEXT_NODE, text);
   }
 
-  cloneNode(_deep?: boolean) {
+  override cloneNode(_deep?: boolean) {
     return new MockTextNode(null, this.nodeValue);
   }
 
-  get textContent() {
+  override get textContent() {
     return this.nodeValue;
   }
-  set textContent(text) {
+  override set textContent(text) {
     this.nodeValue = text;
   }