Skip to content

Upgrade typescript #3084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cameron-martin wants to merge 1 commit into from
Closed

Upgrade typescript #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LANGUAGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr
<td align=left><a href="https://github.com/apache/thrift/blob/master/lib/nodets/README.md">node.ts</a></td>
<!-- Since -----------------><td>0.12.0</td>
<!-- Build Systems ---------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td>
<!-- Language Levels -------><td>3.1.6</td><td></td>
<!-- Language Levels -------><td>5.7.2</td><td></td>
<!-- Field types -----------><td><img src="/doc/images/cred.png" alt=""/></td>
<!-- Low-Level Transports --><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
<!-- Transport Wrappers ----><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td>
Expand Down
33 changes: 16 additions & 17 deletions lib/nodejs/test/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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") {
Expand All @@ -101,10 +102,8 @@ if (ssl) {

let connection;
let client;
const testDriver = program.callback
? ThriftTestDriver
: ThriftTestDriverPromise;
if (helpers.ecmaMode === "es6" && program.callback) {
const testDriver = opts.callback ? ThriftTestDriver : ThriftTestDriverPromise;
if (helpers.ecmaMode === "es6" && opts.callback) {
console.log("ES6 does not support callback style");
process.exit(0);
}
Expand Down
7 changes: 4 additions & 3 deletions lib/nodejs/test/episodic-code-generation-test/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions lib/nodejs/test/episodic-code-generation-test/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand Down
25 changes: 13 additions & 12 deletions lib/nodejs/test/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
)
Expand All @@ -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") {
Expand Down
11 changes: 6 additions & 5 deletions lib/nodets/test/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
24 changes: 11 additions & 13 deletions lib/nodets/test/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
import thrift = require("thrift");
var program = require("commander");
import ThriftTest = require("./gen-nodejs/ThriftTest");
import test_handler = require("./test_handler");
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("--promise", "test with promise style functions")
.option("--protocol", '"Set thrift protocol (binary) [protocol]"')
.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) {
server = thrift.createServer(
ThriftTest.Processor,
new test_handler.AsyncThriftTestHandler(),
options,
);
if (opts.promise) {
server = thrift.createServer(ThriftTest.Processor, new test_handler.AsyncThriftTestHandler(), options);
} else {
server = thrift.createServer(
ThriftTest.Processor,
Expand Down
27 changes: 18 additions & 9 deletions lib/ts/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"jslint": "^0.12.0",
"node-int64": "^0.4.0",
"phantom": "^6.0.3",
"typescript": "^3.2.4"
"typescript": "^5.7.2"
},
"dependencies": {
"bufferutil": "^4.0.1",
Expand Down
Loading
Loading