Upgrade typescript

Client: nodejs

Typescript was on a really old version, and upgrading this is necessary for future changes. Upgrading this required upgrading `@types/node` and `commander`, since the old versions of these are not compatible with the newer version of typescript.

Author: cameron-martin

lib/nodejs/test/client.js

@@ -29,7 +29,7 @@ const ThriftTestDriverPromise = require("./test_driver")
   .ThriftTestDriverPromise;
 const SecondService = require(`./${helpers.genPath}/SecondService`);
 
-const program = require("commander");
+const { program } = require("commander");
 
 program
   .option(
@@ -49,34 +49,35 @@ program
   .option("--ssl", "use SSL transport")
   .option("--callback", "test with callback style functions")
   .option(
-    "-t, --type <type>",
+    "--type <type>",
     "Select server type (http|multiplex|tcp|websocket)",
     "tcp"
   )
   .option("--es6", "Use es6 code")
   .option("--es5", "Use es5 code")
   .parse(process.argv);
 
-const host = program.host;
-const port = program.port;
-const domainSocket = program.domainSocket;
-const ssl = program.ssl;
-let type = program.type;
+const opts = program.opts();
+const host = opts.host;
+const port = opts.port;
+const domainSocket = opts.domainSocket;
+const ssl = opts.ssl;
+let type = opts.type;
 
 /* for compatibility with cross test invocation for http transport testing */
-if (program.transport === "http") {
-  program.transport = "buffered";
+if (opts.transport === "http") {
+  opts.transport = "buffered";
   type = "http";
 }
 
-if (program.transport === "websocket") {
-  program.transport = "buffered";
+if (opts.transport === "websocket") {
+  opts.transport = "buffered";
   type = "websocket";
 }
 
 const options = {
-  transport: helpers.transports[program.transport],
-  protocol: helpers.protocols[program.protocol]
+  transport: helpers.transports[opts.transport],
+  protocol: helpers.protocols[opts.protocol]
 };
 
 if (type === "http" || type === "websocket") {
@@ -101,10 +102,10 @@ if (ssl) {
 
 let connection;
 let client;
-const testDriver = program.callback
+const testDriver = opts.callback
   ? ThriftTestDriver
   : ThriftTestDriverPromise;
-if (helpers.ecmaMode === "es6" && program.callback) {
+if (helpers.ecmaMode === "es6" && opts.callback) {
   console.log("ES6 does not support callback style");
   process.exit(0);
 }

lib/nodejs/test/episodic-code-generation-test/client.js

@@ -22,7 +22,7 @@
 const assert = require("assert");
 const test = require("tape");
 const thrift = require("thrift");
-const program = require("commander");
+const { program } = require("commander");
 
 program
   .option("--host <host>", "Set the thrift server host to connect", "localhost")
@@ -32,8 +32,9 @@ program
 const Service = require("./gen-2/second-episode/gen-nodejs/Service");
 const Types = require("types-package/first-episode/Types_types");
 
-const host = program.host;
-const port = program.port;
+const opts = program.opts();
+const host = opts.host;
+const port = opts.port;
 
 const options = {
   transport: thrift.TBufferedTransport,

lib/nodejs/test/episodic-code-generation-test/server.js

@@ -20,7 +20,7 @@
  */
 
 const thrift = require("../../lib/thrift");
-const program = require("commander");
+const { program } = require("commander");
 
 program
   .option("--port <port>", "Set the thrift server port", 9090)
@@ -29,7 +29,8 @@ program
 const Service = require("./gen-2/second-episode/gen-nodejs/Service");
 const Types = require("types-package/first-episode/Types_types");
 
-const port = program.port;
+const opts = program.opts();
+const port = opts.port;
 
 const options = {
   transport: thrift.TBufferedTransport,

lib/nodejs/test/server.js

@@ -22,7 +22,7 @@
 const fs = require("fs");
 const path = require("path");
 const thrift = require("../lib/thrift");
-const program = require("commander");
+const  { program } = require("commander");
 const helpers = require("./helpers");
 
 program
@@ -40,7 +40,7 @@ program
   .option("--port <port>", "Set thrift server port", 9090)
   .option("--domain-socket <path>", "Set thift server unix domain socket")
   .option(
-    "-t, --type <type>",
+    "--type <type>",
     "Select server type (http|multiplex|tcp|websocket)",
     "tcp"
   )
@@ -53,22 +53,23 @@ const ThriftTest = require(`./${helpers.genPath}/ThriftTest`);
 const SecondService = require(`./${helpers.genPath}/SecondService`);
 const { ThriftTestHandler } = require("./test_handler");
 
-const port = program.port;
-const domainSocket = program.domainSocket;
-const ssl = program.ssl;
+const opts = program.opts();
+const port = opts.port;
+const domainSocket = opts.domainSocket;
+const ssl = opts.ssl;
 
-let type = program.type;
-if (program.transport === "http") {
-  program.transport = "buffered";
+let type = opts.type;
+if (opts.transport === "http") {
+  opts.transport = "buffered";
   type = "http";
-} else if (program.transport === "websocket") {
-  program.transport = "buffered";
+} else if (opts.transport === "websocket") {
+  opts.transport = "buffered";
   type = "websocket";
 }
 
 let options = {
-  transport: helpers.transports[program.transport],
-  protocol: helpers.protocols[program.protocol]
+  transport: helpers.transports[opts.transport],
+  protocol: helpers.protocols[opts.protocol]
 };
 
 if (type === "http" || type === "websocket") {

lib/nodets/test/client.ts

@@ -25,17 +25,18 @@ import test_driver = require("./test_driver");
 import ThriftTestDriver = test_driver.ThriftTestDriver;
 import ThriftTestDriverPromise = test_driver.ThriftTestDriverPromise;
 
-// var program = require("commander");
-import * as program from "commander";
+import { program } from "commander";
 
 program
-  .option("--port <port>", "Set thrift server port number to connect", 9090)
+  .option("--port <port>", "Set thrift server port number to connect", Number.parseInt, 9090)
   .option("--promise", "test with promise style functions")
   .option("--protocol", "Set thrift protocol (binary) [protocol]")
   .parse(process.argv);
 
-var port: number = program.port;
-var promise = program.promise;
+
+var opts = program.opts();
+var port: number = opts.port;
+var promise = opts.promise;
 
 var options = {
   transport: Thrift.TBufferedTransport,

lib/nodets/test/server.ts

@@ -1,24 +1,25 @@
 import thrift = require("thrift");
-var program = require('commander');
+import { program } from 'commander';
 import ThriftTest = require('./gen-nodejs/ThriftTest');
 import test_handler = require('./test_handler');
 
 
 program
-  .option('--port <port>', 'Set thrift server port', 9090)
+  .option('--port <port>', 'Set thrift server port', Number.parseInt, 9090)
   .option('--promise', 'test with promise style functions')
   .option('--protocol', '"Set thrift protocol (binary) [protocol]"')
   .parse(process.argv);
 
-var port: number = program.port;
+var opts = program.opts();
+var port: number = opts.port;
 
 var options: thrift.ServerOptions = {
   transport: thrift.TBufferedTransport,
   protocol: thrift.TBinaryProtocol
 };
 
 var server: thrift.Server;
-if (program.promise) {
+if (opts.promise) {
   server = thrift.createServer(ThriftTest.Processor, new test_handler.AsyncThriftTestHandler(), options);
 } else {
   server = thrift.createServer(ThriftTest.Processor, new test_handler.SyncThriftTestHandler(), options);

package-lock.json

@@ -43,11 +43,11 @@
     "ws": "^5.2.3"
   },
   "devDependencies": {
-    "@types/node": "^10.12.6",
+    "@types/node": "^22.10.5",
     "@types/node-int64": "^0.4.29",
     "@types/q": "^1.5.1",
     "buffer-equals": "^1.0.4",
-    "commander": "^2.14.1",
+    "commander": "^13.0.0",
     "connect": "^3.6.6",
     "eslint": "^5.7.0",
     "eslint-config-prettier": "^3.1.0",
@@ -58,7 +58,7 @@
     "nyc": "^15.0.0",
     "prettier": "^1.14.3",
     "tape": "^4.9.0",
-    "typescript": "^3.1.6",
+    "typescript": "^5.7.2",
     "utf-8-validate": "^5.0.0"
   },
   "scripts": {