feat: support typescript 3.6 (#915)

mgechev · Oct 22, 2019 · dcb0218 · dcb0218
1 parent 9cd303c
commit dcb0218
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "standard-version": "7.0.0",
     "ts-node": "8.4.1",
     "tslint": "5.20.0",
-    "typescript": "3.4.5",
+    "typescript": "~3.6.0",
     "zone.js": "0.10.2"
   },
   "peerDependencies": {

diff --git a/src/contextualDecoratorRule.ts b/src/contextualDecoratorRule.ts
@@ -73,7 +73,7 @@ const getClassDecoratorName = (klass: Node): AngularClassDecoratorKeys | undefin
 };
 
 const isDeclarationLike = (node: Node): node is DeclarationLike => {
-  return isAccessor(node) || isMethodDeclaration(node) || isParameterPropertyDeclaration(node) || isPropertyDeclaration(node);
+  return isAccessor(node) || isMethodDeclaration(node) || isParameterPropertyDeclaration(node, node.parent) || isPropertyDeclaration(node);
 };
 
 const validateDeclaration = (walkContext: WalkContext, node: DeclarationLike): void => {

diff --git a/src/preferInlineDecoratorRule.ts b/src/preferInlineDecoratorRule.ts
@@ -196,9 +196,9 @@ const callbackHandler = (walkContext: WalkContext<OptionDictionary>, node: Node)
     validateGetAccessorDeclaration(walkContext, node);
   } else if (methods && isMethodDeclaration(node)) {
     validateMethodDeclaration(walkContext, node);
-  } else if (parameters && isParameter(node) && !isParameterPropertyDeclaration(node)) {
+  } else if (parameters && isParameter(node) && !isParameterPropertyDeclaration(node, node.parent)) {
     validateParameterDeclaration(walkContext, node);
-  } else if (parameterProperties && isParameterPropertyDeclaration(node)) {
+  } else if (parameterProperties && isParameterPropertyDeclaration(node, node.parent)) {
     validateParameterPropertyDeclaration(walkContext, node);
   } else if (properties && isPropertyDeclaration(node)) {
     validatePropertyDeclaration(walkContext, node);

diff --git a/src/templateAccessibilityLabelForRule.ts b/src/templateAccessibilityLabelForRule.ts
@@ -133,9 +133,9 @@ class TemplateVisitorCtrl extends BasicTemplateAstVisitor {
 
     const { controlComponents, labelAttributes, labelComponents } = (options.ruleArguments[0] || {}) as OptionDictionary;
 
-    this.controlComponents = new Set([...DEFAULT_CONTROL_COMPONENTS, ...controlComponents]);
-    this.labelAttributes = new Set([...DEFAULT_LABEL_ATTRIBUTES, ...labelAttributes]);
-    this.labelComponents = new Set([...DEFAULT_LABEL_COMPONENTS, ...labelComponents]);
+    this.controlComponents = new Set([...DEFAULT_CONTROL_COMPONENTS.concat(controlComponents)]);
+    this.labelAttributes = new Set([...DEFAULT_LABEL_ATTRIBUTES.concat(labelAttributes)]);
+    this.labelComponents = new Set([...DEFAULT_LABEL_COMPONENTS.concat(labelComponents)]);
   }
 
   visitElement(element: ElementAst, context: any): any {

diff --git a/src/util/isInteractiveElement.ts b/src/util/isInteractiveElement.ts
@@ -28,14 +28,14 @@ const interactiveRoles: any = new Set(
   })
 );
 
-const nonInteractiveElementRoleSchemas = elementRoleEntries.reduce((accumulator: any, [elementSchema, roleSet]: any) => {
+const nonInteractiveElementRoleSchemas = elementRoleEntries.reduce((accumulator: any[], [elementSchema, roleSet]: any) => {
   if (Array.from(roleSet).every((role): boolean => nonInteractiveRoles.has(role))) {
     accumulator.push(elementSchema);
   }
   return accumulator;
 }, []);
 
-const interactiveElementRoleSchemas = elementRoleEntries.reduce((accumulator: any, [elementSchema, roleSet]: any) => {
+const interactiveElementRoleSchemas = elementRoleEntries.reduce((accumulator: any[], [elementSchema, roleSet]: any) => {
   if (Array.from(roleSet).some((role): boolean => interactiveRoles.has(role))) {
     accumulator.push(elementSchema);
   }
@@ -44,7 +44,7 @@ const interactiveElementRoleSchemas = elementRoleEntries.reduce((accumulator: an
 
 const interactiveAXObjects = new Set(Array.from(AXObjects.keys()).filter(name => AXObjects.get(name).type === 'widget'));
 
-const interactiveElementAXObjectSchemas = Array.from(elementAXObjects).reduce((accumulator: any, [elementSchema, AXObjectSet]: any) => {
+const interactiveElementAXObjectSchemas = Array.from(elementAXObjects).reduce((accumulator: any[], [elementSchema, AXObjectSet]: any) => {
   if (Array.from(AXObjectSet).every((role): boolean => interactiveAXObjects.has(role))) {
     accumulator.push(elementSchema);
   }