build(deps): bump typescript to 5.0.4 (#3353)

JadenSimon · web-flow · commit 342bff4bda35 · 2023-04-19T09:48:57.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3483,8 +3483,8 @@
         "@types/vscode": "1.50.0",
         "@types/vscode-webview": "^1.57.1",
         "@types/xml2js": "^0.4.8",
-        "@typescript-eslint/eslint-plugin": "^5.38.0",
-        "@typescript-eslint/parser": "^5.38.0",
+        "@typescript-eslint/eslint-plugin": "^5.59.0",
+        "@typescript-eslint/parser": "^5.59.0",
         "@vscode/codicons": "^0.0.32",
         "@vscode/test-electron": "^2.2.3",
         "@vue/compiler-sfc": "^3.2.40",
@@ -3548,7 +3548,7 @@
         "semver": "^7.3.5",
         "strip-ansi": "^5.2.0",
         "tcp-port-used": "^1.0.1",
-        "typescript": "^4.8.4",
+        "typescript": "^5.0.4",
         "uuid": "^8.3.2",
         "vscode-languageclient": "^6.1.4",
         "vscode-languageserver": "^6.1.1",
diff --git a/src/apprunner/wizards/apprunnerCreateServiceWizard.ts b/src/apprunner/wizards/apprunnerCreateServiceWizard.ts
@@ -39,7 +39,7 @@ const validateName = (name: string) => {
         )
     }
 
-    let matches = name.match(badNameRegExp)
+    let matches: string[] | undefined = name.match(badNameRegExp) ?? undefined
     if (name[0] === '_' || name[0] === '-') {
         matches = matches ? [name[0]].concat(matches) : [name[0]]
     }
diff --git a/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts b/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
@@ -93,7 +93,7 @@ export class JavaDependencyGraph extends DependencyGraph {
         return packagePath
     }
 
-    private generateBuildFileRelativePath(uri: vscode.Uri, projectPath: string, pacakges: RegExpMatchArray) {
+    private generateBuildFileRelativePath(uri: vscode.Uri, projectPath: string, pacakges: string[]) {
         const packagePath = pacakges.length > 0 ? this.generatePackagePath(pacakges[0]) : ''
         const sourceFilePath = uri.fsPath
         if (!sourceFilePath.startsWith(projectPath)) {
diff --git a/src/shared/utilities/tsUtils.ts b/src/shared/utilities/tsUtils.ts
@@ -42,11 +42,11 @@ export function isNonNullable<T>(obj: T): obj is NonNullable<T> {
     return obj !== undefined && obj !== null
 }
 
-export function isKeyOf<T>(key: PropertyKey, obj: T): key is keyof T {
+export function isKeyOf<T extends object>(key: PropertyKey, obj: T): key is keyof T {
     return key in obj
 }
 
-export function hasKey<T, K extends PropertyKey>(obj: T, key: K): obj is T & { [P in K]: unknown } {
+export function hasKey<T extends object, K extends PropertyKey>(obj: T, key: K): obj is T & { [P in K]: unknown } {
     return isKeyOf(key, obj)
 }
 
diff --git a/src/test/codecatalyst/devfileLocation.test.ts b/src/test/codecatalyst/devfileLocation.test.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode'
 import { getDevfileLocation } from '../../codecatalyst/model'
 import { DevEnvClient } from '../../shared/clients/devenvClient'
 import * as sinon from 'sinon'
-const fileSystemUtils = require('../../shared/filesystemUtilities')
+import * as fileSystemUtils from '../../shared/filesystemUtilities'
 
 describe('getDevfileLocation', function () {
     let sandbox: sinon.SinonSandbox
@@ -47,7 +47,7 @@ describe('getDevfileLocation', function () {
 
     it('devfile without repo found in workspace root', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('devfile.yaml')
@@ -57,7 +57,7 @@ describe('getDevfileLocation', function () {
 
     it('devfile found in subfolder with repo', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('WebApplication/devfile.yaml')
@@ -74,7 +74,7 @@ describe('getDevfileLocation', function () {
 
     it('falls back to default projects location when devfile cannot be located', async function () {
         const devfilePath = vscode.Uri.parse('/projects/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('WebApplication/devfile.yaml')
@@ -84,7 +84,7 @@ describe('getDevfileLocation', function () {
 
     it('falls back to default workspace location when devfile cannot be located', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('devfile.yaml')
@@ -94,7 +94,7 @@ describe('getDevfileLocation', function () {
 
     it('checks project root for devfile when location isnt specified', async function () {
         const devfilePath = vscode.Uri.parse('/projects/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient(undefined)
@@ -104,7 +104,7 @@ describe('getDevfileLocation', function () {
 
     it('checks workspace root for devfile when location isnt specified', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient(undefined)
diff --git a/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/src/test/credentials/provider/sharedCredentialsProvider.test.ts
@@ -409,7 +409,7 @@ describe('SharedCredentialsProvider', async function () {
         ): Promise<void> {
             const makeIni = sandbox.stub(sut as any, 'makeSharedIniFileCredentialsProvider').callsFake(profile => {
                 // The SDK does not care if fields are undefined, but we need to remove them to test
-                stripUndefined(profile)
+                stripUndefined(profile as any)
                 assert.deepStrictEqual(profile, resolvedProfile)
                 return () => Promise.resolve({})
             })
diff --git a/src/test/setupUtil.ts b/src/test/setupUtil.ts
@@ -23,7 +23,7 @@ export function setRunnableTimeout(test: Mocha.Runnable, maxTestDuration: number
 
     // The timeout duration is stored within the function itself, allowing
     // us to know if we've already added a timeout
-    if (!hasKey(test.fn, runnableTimeout)) {
+    if (!hasKey(testFn, runnableTimeout)) {
         const fn = function (this: Mocha.Context, done: Mocha.Done) {
             const maxTestDuration = (fn as any)[runnableTimeout] as number
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ const validateName = (name: string) => {`
`39`	`39`	`)`
`40`	`40`	`}`
`41`	`41`
`42`		`- let matches = name.match(badNameRegExp)`
	`42`	`+ let matches: string[] \| undefined = name.match(badNameRegExp) ?? undefined`
`43`	`43`	`if (name[0] === '_' \|\| name[0] === '-') {`
`44`	`44`	`matches = matches ? [name[0]].concat(matches) : [name[0]]`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export class JavaDependencyGraph extends DependencyGraph {`
`93`	`93`	`return packagePath`
`94`	`94`	`}`
`95`	`95`
`96`		`- private generateBuildFileRelativePath(uri: vscode.Uri, projectPath: string, pacakges: RegExpMatchArray) {`
	`96`	`+ private generateBuildFileRelativePath(uri: vscode.Uri, projectPath: string, pacakges: string[]) {`
`97`	`97`	`const packagePath = pacakges.length > 0 ? this.generatePackagePath(pacakges[0]) : ''`
`98`	`98`	`const sourceFilePath = uri.fsPath`
`99`	`99`	`if (!sourceFilePath.startsWith(projectPath)) {`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ export function isNonNullable<T>(obj: T): obj is NonNullable<T> {`
`42`	`42`	`return obj !== undefined && obj !== null`
`43`	`43`	`}`
`44`	`44`
`45`		`-export function isKeyOf<T>(key: PropertyKey, obj: T): key is keyof T {`
	`45`	`+export function isKeyOf<T extends object>(key: PropertyKey, obj: T): key is keyof T {`
`46`	`46`	`return key in obj`
`47`	`47`	`}`
`48`	`48`
`49`		`-export function hasKey<T, K extends PropertyKey>(obj: T, key: K): obj is T & { [P in K]: unknown } {`
	`49`	`+export function hasKey<T extends object, K extends PropertyKey>(obj: T, key: K): obj is T & { [P in K]: unknown } {`
`50`	`50`	`return isKeyOf(key, obj)`
`51`	`51`	`}`
`52`	`52`