build: update typescript to 5.2.2

bafolts · Aug 29, 2023 · 6a0b8c5 · 6a0b8c5
1 parent d2b147f
commit 6a0b8c5
Show file tree

Hide file tree

Showing 7 changed files with 2,504 additions and 3,247 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "glob": "^7.1.6",
     "node-plantuml": "0.9.0",
     "plantuml-encoder": "^1.4.0",
-    "typescript": "4.0.3"
+    "typescript": "5.2.2"
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
@@ -53,8 +53,8 @@
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
     "eslint": "^8.48.0",
-    "jest": "^27.0.6",
-    "ts-jest": "^27.0.3"
+    "jest": "^29.1.1",
+    "ts-jest": "^29.1.1"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/src/Factories/ComponentFactory.ts b/src/Factories/ComponentFactory.ts
@@ -81,7 +81,7 @@ export function create(fileName: string, node: ts.Node, checker: ts.TypeChecker)
     return componentComposites;
 }
 
-function getModifier(modifiers: ts.NodeArray<ts.Modifier>): Modifier {
+function getModifier(modifiers: readonly ts.Modifier[]): Modifier {
     for (const modifier of modifiers) {
         if (modifier.kind === ts.SyntaxKind.PrivateKeyword) {
             return 'private';
@@ -119,7 +119,7 @@ function getOriginalFile(typeSymbol: ts.Symbol, checker: ts.TypeChecker): string
         deAliasSymbol = typeSymbol;
     }
 
-    return deAliasSymbol.declarations?.[0].getSourceFile().fileName;
+    return deAliasSymbol.declarations?.[0].getSourceFile().fileName ?? '';
 }
 
 export function getOriginalFileOriginalType(tsType: ts.Type, checker: ts.TypeChecker): string {
@@ -160,7 +160,10 @@ function isTypeParameter(declaration: ts.NamedDeclaration): boolean {
 }
 
 export function getMemberModifier(memberDeclaration: ts.Declaration): Modifier {
-    const memberModifiers: ts.NodeArray<ts.Modifier> | undefined = memberDeclaration.modifiers;
+    if (!ts.canHaveModifiers(memberDeclaration)) {
+        return 'public';
+    }
+    const memberModifiers: readonly ts.Modifier[] | undefined = ts.getModifiers(memberDeclaration);
 
     if (memberModifiers === undefined) {
         return 'public';
@@ -171,7 +174,11 @@ export function getMemberModifier(memberDeclaration: ts.Declaration): Modifier {
 
 export function isModifier(memberDeclaration: ts.Declaration, modifierKind: ts.SyntaxKind): boolean {
 
-    const memberModifiers: ts.NodeArray<ts.Modifier> | undefined = memberDeclaration.modifiers;
+    if (!ts.canHaveModifiers(memberDeclaration)) {
+        return false;
+    }
+
+    const memberModifiers: readonly ts.Modifier[] | undefined = ts.getModifiers(memberDeclaration);
 
     if (memberModifiers !== undefined) {
         for (const memberModifier of memberModifiers) {

diff --git a/src/Factories/MethodFactory.ts b/src/Factories/MethodFactory.ts
@@ -23,7 +23,7 @@ export function create(signature: ts.Symbol, namedDeclaration: ts.NamedDeclarati
             result.typeParameters = methodSignature.typeParameters
                 .map(
                     (typeParameter: ts.TypeParameter) =>
-                    TypeParameterFactory.create(typeParameter.symbol, typeParameter.symbol.declarations[0], checker)
+                    TypeParameterFactory.create(typeParameter.symbol, typeParameter.symbol.declarations?.[0], checker)
                 );
         }
     }

diff --git a/src/Factories/ParameterFactory.ts b/src/Factories/ParameterFactory.ts
@@ -12,6 +12,10 @@ export function create(parameterSymbol: ts.Symbol, checker: ts.TypeChecker): Par
         declaration = declarations[0];
     }
 
+    if (parameterSymbol.valueDeclaration === undefined) {
+        throw new Error("unable to determine parameterType");
+    }
+
     const typeOfSymbol: ts.Type = checker.getTypeOfSymbolAtLocation(
         parameterSymbol,
         parameterSymbol.valueDeclaration

diff --git a/src/Factories/PropertyFactory.ts b/src/Factories/PropertyFactory.ts
@@ -9,6 +9,11 @@ export function create(signature: ts.Symbol, namedDeclaration: ts.NamedDeclarati
     result.isOptional = ComponentFactory.isOptional(<ts.PropertyDeclaration>namedDeclaration);
     result.isStatic = ComponentFactory.isModifier(namedDeclaration, ts.SyntaxKind.StaticKeyword);
     result.isReadonly = ComponentFactory.isModifier(namedDeclaration, ts.SyntaxKind.ReadonlyKeyword);
+
+    if (signature.valueDeclaration === undefined) {
+        throw new Error("unable to determing returnType");
+    }
+
     result.returnType = checker.typeToString(
         checker.getTypeOfSymbolAtLocation(
             signature,

diff --git a/src/Factories/TypeParameterFactory.ts b/src/Factories/TypeParameterFactory.ts
@@ -13,9 +13,13 @@ export function getConstraint(memberDeclaration: ts.Declaration, checker: ts.Typ
     return checker.getTypeFromTypeNode(effectiveConstraint);
 }
 
-export function create(signature: ts.Symbol, namedDeclaration: ts.NamedDeclaration, checker: ts.TypeChecker): TypeParameter {
+export function create(signature: ts.Symbol, namedDeclaration: ts.NamedDeclaration | undefined, checker: ts.TypeChecker): TypeParameter {
     const result: TypeParameter = new TypeParameter(signature.getName());
 
+    if (namedDeclaration === undefined) {
+        return result;
+    }
+
     const constraintType: ts.Type | undefined = getConstraint(namedDeclaration, checker);
 
     if (constraintType !== undefined) {