Upgrade to TypeScript 6.0 and module: nodenext to remove reference directives

.github/workflows/ci.yml

@@ -13,7 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x]
+
 
     steps:
       - uses: actions/checkout@v3

README.md

@@ -3,7 +3,7 @@
 A Promisified layer over [rhea](https://github.com/amqp/rhea) AMQP client.
 
 ## Pre-requisite ##
-- **Node.js version: 6.x or higher.** 
+- **Node.js version: 20.x or higher.** 
 - We would **still encourage you** to install the latest available LTS version at any given time from https://nodejs.org. **It is a good practice to always install the latest available LTS version of node.js.**
 - Installing node.js on **Windows or macOS** is very simple with available installers on the [node.js website](https://nodejs.org). If you are using a **linux based OS**, then you can find easy to follow, one step installation instructions over [here](https://nodejs.org/en/download/package-manager/).
 

changelog.md

@@ -1,3 +1,9 @@
+### 3.0.4 - (Unreleased)
+
+- Upgrade TypeScript to 6.0 and switch `module` to `nodenext` to remove auto-generated `/// <reference types="node" />` directives from typings.
+- Update minimum Node.js version to 20.x (Node 16 and 18 are EOL).
+- Update `@types/node` to ^20.0.0.
+
 ### 3.0.3 - (2024-06-12)
 
 - Release the resources if `Session.createReceiver()` rejects due to timeout.

lib/awaitableSender.ts

@@ -20,16 +20,16 @@
  * @interface PromiseLike
  */
 export interface PromiseLike {
   resolve: (value?: any) => void;
   reject: (reason?: any) => void;
-  timer: NodeJS.Timer;
+  timer: ReturnType<typeof setTimeout>;
 }
 
 /**
  * Describes the event listeners that can be added to the AwaitableSender.
  * @interface Sender
  */
 export declare interface AwaitableSender {
   on(event: SenderEvents, listener: OnAmqpEvent): this;
 }
 
@@ -63,7 +63,7 @@
  * Describes the sender where one can await on the message being sent.
  * @class AwaitableSender
  */
 export class AwaitableSender extends BaseSender {
   /**
    * @property {Map<number, PromiseLike} deliveryDispositionMap Maintains a map of delivery of
    * messages that are being sent. It acts as a store for correlating the dispositions received
@@ -230,11 +230,11 @@
 
         const delivery = (this._link as RheaSender).send(msg, options.tag, options.format);
         this.deliveryDispositionMap.set(delivery.id, {
           resolve: (delivery: any) => {
             resolve(delivery);
             removeAbortListener();
           },
           reject: (reason?: any) => {
             reject(reason);
             removeAbortListener();
           },

lib/log.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache License. See License in the project root for license information.
 
-import * as debugModule from "debug";
+import debugModule from "debug";
 /**
  * @ignore
  * log statements for container

package.json

@@ -30,7 +30,7 @@
     "@types/chai": "^4.3.7",
     "@types/debug": "^4.0.0",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^16.0.0",
+    "@types/node": "^20.0.0",
     "@typescript-eslint/eslint-plugin": "~7.8.0",
     "@typescript-eslint/parser": "~7.8.0",
     "chai": "^4.3.10",
@@ -41,7 +41,7 @@
     "mocha": "^10.0.0",
     "rimraf": "^5.0.5",
     "ts-node": "^10.0.0",
-    "typescript": "~5.0.4"
+    "typescript": "^6.0.2"
   },
   "scripts": {
     "lint": "eslint .",

review/rhea-promise.api.md

@@ -4,8 +4,6 @@
 
 ```ts
 
-/// <reference types="node" />
-
 import { AmqpError } from 'rhea';
 import { Connection as Connection_2 } from 'rhea';
 import { ConnectionError } from 'rhea';
@@ -428,7 +426,7 @@ interface PromiseLike_2 {
     // (undocumented)
     resolve: (value?: any) => void;
     // (undocumented)
-    timer: NodeJS.Timer;
+    timer: ReturnType<typeof setTimeout>;
 }
 export { PromiseLike_2 as PromiseLike }
 

test/connection.spec.ts

@@ -1,4 +1,4 @@
-import * as rhea from "rhea";
+import rhea from "rhea";
 import { assert } from "chai";
 import { Connection, ConnectionEvents, ConnectionOptions, Container } from "../lib/index";
 import { AbortController } from "@azure/abort-controller";

test/receiver.spec.ts

@@ -1,4 +1,4 @@
-import * as rhea from "rhea";
+import rhea from "rhea";
 import { assert } from "chai";
 import { Connection } from "../lib/index";
 import { AddressInfo } from "net";

test/sender.spec.ts

@@ -1,4 +1,4 @@
-import * as rhea from "rhea";
+import rhea from "rhea";
 import { assert } from "chai";
 import { Connection, InsufficientCreditError } from "../lib/index";
 import { AbortController } from "@azure/abort-controller";

test/session.spec.ts

@@ -1,4 +1,4 @@
-import * as rhea from "rhea";
+import rhea from "rhea";
 import { assert } from "chai";
 import { Connection, SessionEvents, Session } from "../lib/index";
 import { AbortController } from "@azure/abort-controller";

tsconfig.json

@@ -1,12 +1,13 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "preserveConstEnums": true,
     "sourceMap": true,
     "newLine": "LF",
     "target": "es2015",
     "importHelpers": true,
-    "moduleResolution": "node",
+    "types": ["node", "mocha", "chai"],
     "noImplicitReturns": true,
     "outDir": "dist",
     "allowJs": false,