Just use the tsconfig.json file

alexr00 · alexr00 · commit 9735730d87d2 · 2025-09-26T15:42:52.000+02:00
diff --git a/src/test/browser/index.ts b/src/test/browser/index.ts
@@ -1,3 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-nocheck
 // This file is providing the test runner to use when running extension tests.
 import * as vscode from 'vscode';
 require('mocha/mocha');
diff --git a/src/test/builders/graphql/latestReviewCommitBuilder.ts b/src/test/builders/graphql/latestReviewCommitBuilder.ts
@@ -8,7 +8,7 @@ import { LatestReviewCommitResponse } from '../../../github/graphql';
 
 import { RateLimitBuilder } from './rateLimitBuilder';
 
-type Repository = LatestReviewCommitResponse['repository'];
+type Repository = NonNullable<LatestReviewCommitResponse['repository']>;
 type PullRequest = Repository['pullRequest'];
 type ViewerLatestReview = PullRequest['viewerLatestReview'];
 type Commit = ViewerLatestReview['commit'];
diff --git a/src/test/builders/graphql/pullRequestBuilder.ts b/src/test/builders/graphql/pullRequestBuilder.ts
@@ -37,7 +37,7 @@ const RefBuilder = createBuilderClass<Ref>()({
 	}),
 });
 
-type Repository = PullRequestResponse['repository'];
+type Repository = NonNullable<PullRequestResponse['repository']>;
 type PullRequest = Repository['pullRequest'];
 type Author = PullRequest['author'];
 type AssigneesConn = PullRequest['assignees'];
diff --git a/src/test/builders/graphql/timelineEventsBuilder.ts b/src/test/builders/graphql/timelineEventsBuilder.ts
@@ -1,9 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 import { createBuilderClass, createLink } from '../base';
 import { TimelineEventsResponse } from '../../../github/graphql';
 
 import { RateLimitBuilder } from './rateLimitBuilder';
 
-type Repository = TimelineEventsResponse['repository'];
+type Repository = NonNullable<TimelineEventsResponse['repository']>;
 type PullRequest = Repository['pullRequest'];
 type TimelineConn = PullRequest['timelineItems'];
 
diff --git a/src/test/builders/rest/pullRequestBuilder.ts b/src/test/builders/rest/pullRequestBuilder.ts
@@ -1,5 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 import { UserBuilder } from './userBuilder';
-import { RefBuilder } from './refBuilder';
+import { NonNullUserRefBuilder, RefBuilder } from './refBuilder';
 import { createLink, createBuilderClass } from '../base';
 import { OctokitCommon } from '../../../github/common';
 
@@ -40,8 +45,8 @@ export const PullRequestBuilder = createBuilderClass<PullRequestUnion>()({
 	closed_at: { default: '' },
 	merged_at: { default: '' },
 	merge_commit_sha: { default: '' },
-	head: { linked: RefBuilder },
-	base: { linked: RefBuilder },
+	head: { linked: NonNullUserRefBuilder },
+	base: { linked: NonNullUserRefBuilder },
 	draft: { default: false },
 	merged: { default: false },
 	mergeable: { default: true },
diff --git a/src/test/builders/rest/refBuilder.ts b/src/test/builders/rest/refBuilder.ts
@@ -1,11 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 import { UserBuilder } from './userBuilder';
 import { RepositoryBuilder } from './repoBuilder';
 import { createBuilderClass } from '../base';
 import { OctokitCommon } from '../../../github/common';
 
 type RefUnion = OctokitCommon.PullsListResponseItemHead & OctokitCommon.PullsListResponseItemBase;
 
-export const RefBuilder = createBuilderClass<RefUnion>()({
+export const RefBuilder = createBuilderClass<NonNullable<RefUnion>>()({
 	label: { default: 'octocat:new-feature' },
 	ref: { default: 'new-feature' },
 	user: { linked: UserBuilder },
@@ -14,4 +19,15 @@ export const RefBuilder = createBuilderClass<RefUnion>()({
 	repo: { linked: <any>RepositoryBuilder },
 });
 
+// Variant where user is guaranteed non-null.
+type NonNullUserRef = Omit<RefUnion, 'user'> & { user: NonNullable<RefUnion['user']> };
+
+export const NonNullUserRefBuilder = createBuilderClass<NonNullUserRef>()({
+	label: { default: 'octocat:new-feature' },
+	ref: { default: 'new-feature' },
+	user: { linked: UserBuilder }, // non-null guarantee
+	sha: { default: '0000000000000000000000000000000000000000' },
+	repo: { linked: <any>RepositoryBuilder },
+});
+
 export type RefBuilder = InstanceType<typeof RefBuilder>;
diff --git a/src/test/builders/rest/repoBuilder.ts b/src/test/builders/rest/repoBuilder.ts
@@ -16,7 +16,7 @@ type License = RepoUnion['license'];
 type Permissions = RepoUnion['permissions'];
 type CodeOfConduct = RepoUnion['code_of_conduct'];
 
-export const RepositoryBuilder = createBuilderClass<RepoUnion>()({
+export const RepositoryBuilder = createBuilderClass<NonNullable<RepoUnion>>()({
 	id: { default: 0 },
 	node_id: { default: 'node0' },
 	name: { default: 'reponame' },
@@ -123,9 +123,9 @@ export const RepositoryBuilder = createBuilderClass<RepoUnion>()({
 		name: { default: 'name' },
 		url: { default: 'https://github.com/octocat/reponame' },
 	}),
-	forks: { default: null },
-	open_issues: { default: null },
-	watchers: { default: null },
+	forks: { default: 0 },
+	open_issues: { default: 0 },
+	watchers: { default: 0 },
 });
 
 export type RepositoryBuilder = InstanceType<typeof RepositoryBuilder>;
diff --git a/src/test/builders/rest/userBuilder.ts b/src/test/builders/rest/userBuilder.ts
@@ -17,7 +17,9 @@ type UserUnion =
 	| OctokitCommon.PullsListResponseItemHeadRepoOwner
 	| OctokitCommon.IssuesListEventsForTimelineResponseItemActor;
 
-export const UserBuilder = createBuilderClass<Required<UserUnion>>()({
+type NonNullUser = NonNullable<UserUnion>;
+
+export const UserBuilder = createBuilderClass<NonNullUser>()({
 	id: { default: 0 },
 	node_id: { default: 'node0' },
 	login: { default: 'octocat' },
diff --git a/src/test/index.ts b/src/test/index.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// @ts-nocheck
+
 // This file is providing the test runner to use when running extension tests.
 import * as path from 'path';
 import * as vscode from 'vscode';
diff --git a/src/test/mocks/mockGitHubRepository.ts b/src/test/mocks/mockGitHubRepository.ts
@@ -21,8 +21,7 @@ import { MockTelemetry } from './mockTelemetry';
 import { Uri } from 'vscode';
 import { LoggingOctokit, RateLogger } from '../../github/loggingOctokit';
 import { mergeQuerySchemaWithShared } from '../../github/common';
-import { PullRequestModel } from '../../github/pullRequestModel';
-import { TimelineEvent } from '../../common/timelineEvent';
+
 const queries = mergeQuerySchemaWithShared(require('../../github/queries.gql'), require('../../github/queriesShared.gql')) as any;
 
 export class MockGitHubRepository extends GitHubRepository {
@@ -35,7 +34,7 @@ export class MockGitHubRepository extends GitHubRepository {
 
 		this._hub = {
 			octokit: new LoggingOctokit(this.queryProvider.octokit, new RateLogger(new MockTelemetry(), true)),
-			graphql: null,
+			graphql: {} as any,
 		};
 
 		this._metadata = Promise.resolve({
@@ -73,8 +72,8 @@ export class MockGitHubRepository extends GitHubRepository {
 		block(builder);
 		const responses = builder.build();
 
-		const prNumber = responses.pullRequest.repository.pullRequest.number;
-		const headRef = responses.pullRequest.repository.pullRequest.headRef;
+		const prNumber = responses.pullRequest.repository!.pullRequest.number;
+		const headRef = responses.pullRequest.repository?.pullRequest.headRef;
 
 		this.queryProvider.expectGraphQLQuery(
 			{
diff --git a/src/test/view/prsTree.test.ts b/src/test/view/prsTree.test.ts
@@ -74,7 +74,7 @@ describe('GitHub Pull Requests view', function () {
 					userAgent: 'GitHub VSCode Pull Requests',
 					previews: ['shadow-cat-preview'],
 				}), new RateLogger(telemetry, true)),
-				graphql: null,
+				graphql: {} as any,
 			};
 
 			return github;
@@ -160,7 +160,7 @@ describe('GitHub Pull Requests view', function () {
 					);
 				});
 			}).pullRequest;
-			const prItem0 = await parseGraphQLPullRequest(pr0.repository.pullRequest, gitHubRepository);
+			const prItem0 = await parseGraphQLPullRequest(pr0.repository!.pullRequest, gitHubRepository);
 			const pullRequest0 = new PullRequestModel(credentialStore, telemetry, gitHubRepository, remote, prItem0);
 
 			const pr1 = gitHubRepository.addGraphQLPullRequest(builder => {
@@ -177,7 +177,7 @@ describe('GitHub Pull Requests view', function () {
 					);
 				});
 			}).pullRequest;
-			const prItem1 = await parseGraphQLPullRequest(pr1.repository.pullRequest, gitHubRepository);
+			const prItem1 = await parseGraphQLPullRequest(pr1.repository!.pullRequest, gitHubRepository);
 			const pullRequest1 = new PullRequestModel(credentialStore, telemetry, gitHubRepository, remote, prItem1);
 
 			const repository = new MockRepository();
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,6 @@
 	},
 	"exclude": [
 		"node_modules",
-		"src/test",
 		"webviews"
 	]
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -157,26 +157,6 @@ async function getWebviewConfig(mode, env, entry) {
 async function getExtensionConfig(target, mode, env) {
 	const basePath = path.join(__dirname, 'src');
 
-	const entry = {
-		extension: './src/extension.ts',
-	};
-	if (target === 'webworker') {
-		entry['test/index'] = './src/test/browser/index.ts';
-	} else if (target === 'node') {
-		entry['test/index'] = './src/test/index.ts';
-	}
-
-	// Determine if we're building tests and choose the appropriate TypeScript config
-	const hasTestEntry = 'test/index' in entry;
-	let tsConfigFile;
-	if (hasTestEntry) {
-		// When building tests, use a config that includes test files
-		tsConfigFile = target === 'webworker' ? 'tsconfig.browser.json' : 'tsconfig.test.json';
-	} else {
-		// When building only extension, use standard configs
-		tsConfigFile = target === 'webworker' ? 'tsconfig.browser.json' : 'tsconfig.json';
-	}
-
 	/**
 	 * @type WebpackConfig['plugins'] | any
 	 */
@@ -188,8 +168,7 @@ async function getExtensionConfig(target, mode, env) {
 			async: false,
 			formatter: 'basic',
 			typescript: {
-				configFile: path.join(__dirname, tsConfigFile),
-				mode: 'write-tsbuildinfo'
+				configFile: path.join(__dirname, target === 'webworker' ? 'tsconfig.browser.json' : 'tsconfig.json'),
 			},
 		}),
 		new webpack.ContextReplacementPlugin(/mocha/, /^$/)
@@ -208,6 +187,15 @@ async function getExtensionConfig(target, mode, env) {
 		}));
 	}
 
+	const entry = {
+		extension: './src/extension.ts',
+	};
+	if (target === 'webworker') {
+		entry['test/index'] = './src/test/browser/index.ts';
+	} else if (target === 'node') {
+		entry['test/index'] = './src/test/index.ts';
+	}
+
 	return {
 		name: `extension:${target}`,
 		entry,
