chore: Add TS 5.0

.github/workflows/runTestsOnPush.yml

@@ -8,7 +8,7 @@ jobs:
       matrix:
         node-version: [18, 19]
         os: [macos-latest, ubuntu-latest, windows-latest]
-        typescript-version: [4.7, 4.8, '^4.9.3']
+        typescript-version: ['^4.9.5', '^5.0.2']
 
     steps:
       - uses: actions/checkout@master

packages/cli/src/metadataGeneration/typeResolver.ts

@@ -916,12 +916,13 @@ export class TypeResolver {
       return node.members.filter(member => !isIgnored(member) && ts.isPropertySignature(member)).map((member: ts.PropertySignature) => this.propertyFromSignature(member, overrideToken));
     }
 
-    // Class model
-    const properties = node.members
-      .filter(member => !isIgnored(member))
-      .filter(member => member.kind === ts.SyntaxKind.PropertyDeclaration)
-      .filter(member => !this.hasStaticModifier(member))
-      .filter(member => this.hasPublicModifier(member)) as Array<ts.PropertyDeclaration | ts.ParameterDeclaration>;
+    const properties: Array<ts.PropertyDeclaration | ts.ParameterDeclaration> = [];
+
+    for (const member of node.members) {
+      if (!isIgnored(member) && ts.isPropertyDeclaration(member) && !this.hasStaticModifier(member) && this.hasPublicModifier(member)) {
+        properties.push(member);
+      }
+    }
 
     const classConstructor = node.members.find(member => ts.isConstructorDeclaration(member)) as ts.ConstructorDeclaration;
 
@@ -1102,7 +1103,7 @@ export class TypeResolver {
     return properties;
   }
 
-  private hasPublicModifier(node: ts.Node) {
+  private hasPublicModifier(node: ts.HasModifiers) {
     return (
       !node.modifiers ||
       node.modifiers.every(modifier => {
@@ -1111,7 +1112,7 @@ export class TypeResolver {
     );
   }
 
-  private hasStaticModifier(node: ts.Node) {
+  private hasStaticModifier(node: ts.HasModifiers) {
     return (
       node.modifiers &&
       node.modifiers.some(modifier => {
@@ -1120,20 +1121,21 @@ export class TypeResolver {
     );
   }
 
-  private isAccessibleParameter(node: ts.Node) {
-    // No modifiers
-    if (!node.modifiers) {
+  private isAccessibleParameter(node: ts.HasModifiers) {
+    const modifiers = ts.getModifiers(node);
+
+    if (modifiers == null || modifiers.length === 0) {
       return false;
     }
 
     // public || public readonly
-    if (node.modifiers.some(modifier => modifier.kind === ts.SyntaxKind.PublicKeyword)) {
+    if (modifiers.some(modifier => modifier.kind === ts.SyntaxKind.PublicKeyword)) {
       return true;
     }
 
     // readonly, not private readonly, not public readonly
-    const isReadonly = node.modifiers.some(modifier => modifier.kind === ts.SyntaxKind.ReadonlyKeyword);
-    const isProtectedOrPrivate = node.modifiers.some(modifier => {
+    const isReadonly = modifiers.some(modifier => modifier.kind === ts.SyntaxKind.ReadonlyKeyword);
+    const isProtectedOrPrivate = modifiers.some(modifier => {
       return modifier.kind === ts.SyntaxKind.ProtectedKeyword || modifier.kind === ts.SyntaxKind.PrivateKeyword;
     });
     return isReadonly && !isProtectedOrPrivate;

packages/cli/src/utils/decoratorUtils.ts

@@ -10,7 +10,7 @@ function tsHasDecorators(ts): ts is {
 
 export function getDecorators(node: ts.Node, isMatching: (identifier: ts.Identifier) => boolean) {
   // beginning in ts4.8 node.decorator is undefined, use getDecorators instead.
-  const decorators = tsHasDecorators(ts) && ts.canHaveDecorators(node) ? ts.getDecorators(node) : node.decorators;
+  const decorators = tsHasDecorators(ts) && ts.canHaveDecorators(node) ? ts.getDecorators(node) : [];
 
   if (!decorators || !decorators.length) {
     return [];