Skip to content

Commit aff63cf

Browse files
committed
chore: Ensure check-types work
Fix issues
1 parent ef1d6b2 commit aff63cf

5 files changed

Lines changed: 17 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
pnpm install
2828
pnpm lint
2929
pnpm test
30+
pnpm check-types
3031
3132
- id: docker_meta
3233
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"typescript": "^6.0.2"
2323
},
2424
"devDependencies": {
25+
"@tsconfig/node24": "^24.0.4",
2526
"@vitest/coverage-v8": "^4.1.4",
2627
"oxfmt": "^0.45.0",
2728
"oxlint": "^1.60.0",

pnpm-lock.yaml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/google.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ export function formatUserList(users: any[]): Set<string> {
3636
export async function getGithubUsersFromGoogle(): Promise<Set<string>> {
3737
const service = await mod.getAdminService()
3838
let githubAccounts = new Set<string>()
39-
let pageToken = null
39+
// oxlint-disable-next-line no-undefined
40+
let pageToken: string | undefined = undefined
4041

4142
do {
42-
const userList = await service.users.list({
43+
const userList: { data: admin_directory_v1.Schema$Users } = await service.users.list({
4344
customFieldMask: 'Accounts',
4445
customer: 'my_customer',
4546
fields: 'users(customSchemas/Accounts/github(value)),nextPageToken',
@@ -48,8 +49,9 @@ export async function getGithubUsersFromGoogle(): Promise<Set<string>> {
4849
projection: 'custom',
4950
query: config.removeSuspendedUsers ? 'isSuspended=false' : '',
5051
})
51-
pageToken = userList.data.nextPageToken
52-
githubAccounts = new Set([...githubAccounts, ...formatUserList(userList.data.users)])
52+
// oxlint-disable-next-line no-undefined
53+
pageToken = userList.data.nextPageToken ?? undefined
54+
githubAccounts = new Set([...githubAccounts, ...formatUserList(userList.data.users ?? [])])
5355
} while (pageToken != null)
5456
return githubAccounts
5557
}

tsconfig.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
{
2+
"extends": "@tsconfig/node24/tsconfig.json",
23
"compilerOptions": {
34
"esModuleInterop": true,
45
"declaration": true,
5-
"lib": ["es2020"],
6-
"target": "es2020",
7-
"downlevelIteration": true,
8-
"moduleResolution": "NodeNext",
9-
"module": "NodeNext",
106
"noEmit": true
117
},
128
"exclude": ["node_modules", "tests/**"]

0 commit comments

Comments
 (0)