⬆️ bump various package versions

package.json

@@ -2,8 +2,8 @@
   "name": "teams-sync",
   "version": "1.0.0",
   "description": "",
-  "main": "app.ts",
-  "module": "es2015",
+  "main": "app.ts", 
+  "type":"module", 
   "scripts": {
     "test": "jest --coverage --reporters=jest-junit",
     "dev": "nodemon",
@@ -19,7 +19,7 @@
     "@octokit/types": "^13.4.0",
     "@types/express": "^4.17.17",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^20.4.8",
+    "@types/node": "22.1.0 ",
     "@types/swagger-ui-express": "^4.1.3",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
@@ -31,17 +31,18 @@
   },
   "dependencies": {
     "@octokit/auth-app": "6.1.1",
+    "@octokit/plugin-throttling": "^9.3.2",
     "applicationinsights": "^3.2.1",
     "axios": "^1.4.0",
     "axios-retry": "^4.0.0",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "js-yaml": "^4.1.0",
     "nocache": "^4.0.0",
-    "octokit": "3.2.1",
+    "octokit": "4.0.2",
     "openapi-backend": "^5.9.1",
     "redis": "^4.7.0",
-    "swagger-ui-express": "5.0.0"
+    "swagger-ui-express": "5.0.1"
   },
   "nodemonConfig": {
     "watch": [

src/app.ts

@@ -4,11 +4,11 @@
 import fs from "fs";
 import path from "node:path";
 import swaggerUi from "swagger-ui-express";
-import { routes } from "./routes";
-import { SetupLogging } from "./logging";
+import { routes } from "./routes.ts";
+import { SetupLogging } from "./logging.ts";
 import nocache from "nocache";
 import { createClient } from 'redis';
-import { Config } from "./config";
+import { Config } from "./config.ts";
 
 import {Request} from "openapi-backend";
 

src/handlers/getCurrentRateLimit.ts

@@ -1,7 +1,7 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { Limits } from "../types/sync-models";
-import { GetClient } from "../services/gitHub";
+import { Limits } from "../types/sync-models.ts";
+import { GetClient } from "../services/gitHub.ts";
 
 export async function getCurrentRateLimitHandler(
     c: Context,

src/handlers/getInstalledOrgs.ts

@@ -1,7 +1,7 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { OrgModel } from "../types/sync-models";
-import { GetClient } from "../services/gitHub";
+import { OrgModel } from "../types/sync-models.ts";
+import { GetClient } from "../services/gitHub.ts";
 
 export async function getInstalledOrgsHandler(
     c: Context,

src/handlers/getSourceTeam.ts

@@ -1,7 +1,7 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { SearchAllAsync } from "../services/ldapClient";
-import { Log } from "../logging";
+import { SearchAllAsync } from "../services/ldapClient.ts";
+import { Log } from "../logging.ts";
 
 export async function getSourceTeamHandler(
     c: Context,

src/handlers/syncAll.ts

@@ -1,11 +1,11 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { GetClient } from "../services/gitHub";
-import { SyncOrg } from "../services/githubSync";
-import { GitHubClient } from "../services/gitHubTypes";
+import { GetClient } from "../services/gitHub.ts";
+import { SyncOrg } from "../services/githubSync.ts";
+import { GitHubClient } from "../services/gitHubTypes.ts";
 import axios from 'axios';
-import { Log } from "../logging";
-import { GetInvitationsClient } from "../services/githubInvitations";
+import { Log } from "../logging.ts";
+import { GetInvitationsClient } from "../services/githubInvitations.ts";
 
 async function syncOrgLocal(installationId: number, client: GitHubClient) {
     const orgClient = await client.GetOrgClient(installationId);

src/handlers/syncOrg.ts

@@ -1,11 +1,11 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { GetClient } from "../services/gitHub";
-import { SyncOrg } from "../services/githubSync";
-import { AsyncReturnType } from "../utility";
+import { GetClient } from "../services/gitHub.ts";
+import { SyncOrg } from "../services/githubSync.ts";
+import { AsyncReturnType } from "../utility.ts";
 import axios from 'axios';
-import { Log } from "../logging";
-import { GetInvitationsClient } from "../services/githubInvitations";
+import { Log } from "../logging.ts";
+import { GetInvitationsClient } from "../services/githubInvitations.ts";
 
 async function forwardToProxy(installationId: number) {    
     Log(`Forwarding request to '${process.env.GITHUB_PROXY}'`);

src/handlers/syncSpecificTeamHandler.ts

@@ -1,10 +1,10 @@
 import { Context } from "openapi-backend";
 import type { Request, Response } from "express";
-import { GetClient } from "../services/gitHub";
-import { SyncTeam } from "../services/githubSync";
+import { GetClient } from "../services/gitHub.ts";
+import { SyncTeam } from "../services/githubSync.ts";
 import axios from 'axios';
-import { Log } from "../logging";
-import { GetInvitationsClient } from "../services/githubInvitations";
+import { Log } from "../logging.ts";
+import { GetInvitationsClient } from "../services/githubInvitations.ts";
 
 async function forwardToProxy(installationId: number) {    
     Log(`Forwarding request to '${process.env.GITHUB_PROXY}'`);

src/routes.ts

@@ -1,9 +1,9 @@
-import { getCurrentRateLimitHandler } from "./handlers/getCurrentRateLimit";
-import { getInstalledOrgsHandler } from "./handlers/getInstalledOrgs";
-import { getSourceTeamHandler } from "./handlers/getSourceTeam";
-import { syncAllHandler } from "./handlers/syncAll";
-import { syncOrgHandler } from "./handlers/syncOrg";
-import { syncSpecificTeamHandler } from "./handlers/syncSpecificTeamHandler";
+import { getCurrentRateLimitHandler } from "./handlers/getCurrentRateLimit.ts";
+import { getInstalledOrgsHandler } from "./handlers/getInstalledOrgs.ts";
+import { getSourceTeamHandler } from "./handlers/getSourceTeam.ts";
+import { syncAllHandler } from "./handlers/syncAll.ts";
+import { syncOrgHandler } from "./handlers/syncOrg.ts";
+import { syncSpecificTeamHandler } from "./handlers/syncSpecificTeamHandler.ts";
 
 function notImplementedHandler(c: any, req: any, res: any) {
     return res

src/services/gitHub.ts

@@ -1,15 +1,15 @@
 import { Octokit } from "octokit";
 import { createAppAuth } from "@octokit/auth-app";
-import { Config } from "../config";
-import { AddMemberResponse, CopilotAddResponse, GitHubClient, GitHubId, GitHubTeamId, InstalledClient, Org, OrgConfigResponse, OrgInvite, OrgRoles, RemoveMemberResponse, Response } from "./gitHubTypes";
-import { AppConfig } from "./appConfig";
+import { Config } from "../config.ts";
+import { AddMemberResponse, CopilotAddResponse, GitHubClient, GitHubId, GitHubTeamId, InstalledClient, Org, OrgConfigResponse, OrgInvite, OrgRoles, RemoveMemberResponse, Response } from "./gitHubTypes.ts";
+import { AppConfig } from "./appConfig.ts";
 import yaml from "js-yaml";
 import { throttling } from "@octokit/plugin-throttling";
-import { AsyncReturnType } from "../utility";
-import { Log, LogError, LoggerToUse } from "../logging";
-import { GitHubClientCache } from "./gitHubCache";
-import { redisClient } from "../app";
-import { GitHubTeamName, OrgConfig, OrgConfigurationOptions } from "./orgConfig";
+import { AsyncReturnType } from "../utility.ts";
+import { Log, LogError, LoggerToUse } from "../logging.ts";
+import { GitHubClientCache } from "./gitHubCache.ts";
+import { redisClient } from "../app.ts";
+import { GitHubTeamName, OrgConfig, OrgConfigurationOptions } from "./orgConfig.ts";
 
 const config = Config();
 

src/services/gitHubCache.ts

@@ -1,6 +1,6 @@
-import { CacheClient } from "../app";
-import { ILogger } from "../logging";
-import { AddMemberResponse, CopilotAddResponse, GitHubTeamId, InstalledClient, OrgConfigResponse, OrgInvite, OrgRoles, RemoveMemberResponse, Response } from "./gitHubTypes";
+import { CacheClient } from "../app.ts";
+import { ILogger } from "../logging.ts";
+import { AddMemberResponse, CopilotAddResponse, GitHubTeamId, InstalledClient, OrgConfigResponse, OrgInvite, OrgRoles, RemoveMemberResponse, Response } from "./gitHubTypes.ts";
 
 export class GitHubClientCache implements InstalledClient {
     client: InstalledClient;

src/services/gitHubTypes.ts

@@ -1,5 +1,5 @@
-import { AppConfig } from "./appConfig"
-import { GitHubTeamName, OrgConfig } from "./orgConfig"
+import { AppConfig } from "./appConfig.ts"
+import { GitHubTeamName, OrgConfig } from "./orgConfig.ts"
 
 export interface Org {
     id: number,

src/services/githubInvitations.ts

@@ -1,4 +1,4 @@
-import { GenericSucceededResponse, InstalledClient, OrgInvite,Response } from "./gitHubTypes";
+import { GenericSucceededResponse, InstalledClient, OrgInvite,Response } from "./gitHubTypes.ts";
 
 export interface IGitHubInvitations {
     ListInvites():Response<OrgInvite[]>

src/services/githubSync.ts

@@ -1,12 +1,12 @@
 // REMEMBER TO REPLACE '_' with '-' for GitHub Names! 🤦‍♂️
 
 import e from "express";
-import { Log, LogError } from "../logging";
-import { AppConfig } from "./appConfig";
-import { CopilotAddResponse, FailedResponse, GitHubId, InstalledClient, OrgInvite } from "./gitHubTypes";
-import { IGitHubInvitations } from "./githubInvitations";
-import { SearchAllAsync } from "./ldapClient";
-import { OrgConfig } from "./orgConfig";
+import { Log, LogError } from "../logging.ts";
+import { AppConfig } from "./appConfig.ts";
+import { CopilotAddResponse, FailedResponse, GitHubId, InstalledClient, OrgInvite } from "./gitHubTypes.ts";
+import { IGitHubInvitations } from "./githubInvitations.ts";
+import { SearchAllAsync } from "./ldapClient.ts";
+import { OrgConfig } from "./orgConfig.ts";
 
 function teamDescription(shortLink: string, sourceTeam: string) {
     return `🤖 Managed by GTTSB: ${shortLink} | Source Team: ${sourceTeam}`

src/services/ldapClient.ts

@@ -1,8 +1,8 @@
-import { Config } from "../config";
+import { Config } from "../config.ts";
 import axios, { AxiosError } from "axios";
 import axiosRetry from "axios-retry";
-import { Log, LoggerToUse } from "../logging";
-import { redisClient } from "../app";
+import { Log, LoggerToUse } from "../logging.ts";
+import { redisClient } from "../app.ts";
 
 const config = Config()
 export interface Entry {

tests/orgConfig.test.ts

@@ -1,5 +1,5 @@
 import {describe, expect, test} from '@jest/globals';
-import { ManagedGitHubTeam, OrgConfig, OrgConfigurationOptions } from '../src/services/orgConfig';
+import { ManagedGitHubTeam, OrgConfig, OrgConfigurationOptions } from '../src/services/orgConfig.ts';
 
 describe('OrgConfigClass', () => {
   test('Sets proper defaults', () => {

tsconfig.json

@@ -1,13 +1,16 @@
 {
   "compilerOptions": {
     "target": "es2021", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    "module": "commonjs", /* Specify what module code is generated. */
+    "module": "node16", /* Specify what module code is generated. */
     "outDir": "./out", /* Specify an output folder for all emitted files. */
     "sourceMap": true,
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
     "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
     "strict": true, /* Enable all strict type-checking options. */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true, /* Skip type checking all .d.ts files. */
+    "allowImportingTsExtensions": true,
+    "emitDeclarationOnly": true,
+    "declaration": true
   }
 }