Upgrade to TypeScript 5.0 (#574)

connectrpc · Apr 4, 2023 · ed86117 · ed86117
1 parent 9d413f9
commit ed86117
Show file tree

Hide file tree

Showing 51 changed files with 148 additions and 149 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "npm": ">=8"
   },
   "devDependencies": {
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.3",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "eslint": "^8.33.0",

diff --git a/packages/connect-express/package.json b/packages/connect-express/package.json
@@ -12,7 +12,7 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types"
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",

diff --git a/packages/connect-express/src/express-connect-middleware.ts b/packages/connect-express/src/express-connect-middleware.ts
@@ -14,12 +14,11 @@
 
 import type { JsonValue } from "@bufbuild/protobuf";
 import {
-  ConnectRouter,
   createConnectRouter,
-  ConnectRouterOptions,
   Code,
   connectErrorFromReason,
 } from "@bufbuild/connect";
+import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
 import type { UniversalHandler } from "@bufbuild/connect/protocol";
 import { compressionBrotli, compressionGzip } from "@bufbuild/connect-node";
 import {

diff --git a/packages/connect-fastify/package.json b/packages/connect-fastify/package.json
@@ -12,7 +12,7 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types"
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",

diff --git a/packages/connect-fastify/src/fastify-connect-plugin.ts b/packages/connect-fastify/src/fastify-connect-plugin.ts
@@ -16,10 +16,9 @@ import type { JsonValue } from "@bufbuild/protobuf";
 import {
   Code,
   connectErrorFromReason,
-  ConnectRouter,
-  ConnectRouterOptions,
   createConnectRouter,
 } from "@bufbuild/connect";
+import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
 import * as protoConnect from "@bufbuild/connect/protocol-connect";
 import * as protoGrpcWeb from "@bufbuild/connect/protocol-grpc-web";
 import * as protoGrpc from "@bufbuild/connect/protocol-grpc";

diff --git a/packages/connect-next/package.json b/packages/connect-next/package.json
@@ -12,7 +12,7 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types"
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",

diff --git a/packages/connect-next/src/connect-nextjs-adapter.ts b/packages/connect-next/src/connect-nextjs-adapter.ts
@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {
-  ConnectRouter,
-  ConnectRouterOptions,
-  createConnectRouter,
-} from "@bufbuild/connect";
+import { createConnectRouter } from "@bufbuild/connect";
+import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
 import type { UniversalHandler } from "@bufbuild/connect/protocol";
 import {
   compressionBrotli,

diff --git a/packages/connect-node-test/package.json b/packages/connect-node-test/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "clean": "rm -rf ./dist/esm/*",
     "generate": "buf generate",
-    "build": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm",
+    "build": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm",
     "jasmine": "jasmine --config=jasmine.json"
   },
   "type": "module",

diff --git a/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts b/packages/connect-node-test/src/crosstest/timeout_on_sleeping_server.spec.ts
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 import {
-  CallOptions,
   Code,
   ConnectError,
   createCallbackClient,
   createPromiseClient,
   connectErrorFromReason,
 } from "@bufbuild/connect";
+import type { CallOptions } from "@bufbuild/connect";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import { createTestServers } from "../helpers/testserver.js";

diff --git a/packages/connect-node-test/src/express-readme.spec.ts b/packages/connect-node-test/src/express-readme.spec.ts
@@ -14,7 +14,8 @@
 
 import * as http from "http";
 import { Message, MethodKind, proto3 } from "@bufbuild/protobuf";
-import { ConnectRouter, createPromiseClient } from "@bufbuild/connect";
+import { createPromiseClient } from "@bufbuild/connect";
+import type { ConnectRouter } from "@bufbuild/connect";
 import { expressConnectMiddleware } from "@bufbuild/connect-express";
 import { createGrpcWebTransport } from "@bufbuild/connect-node";
 import { importExpress } from "./helpers/import-express.js";

diff --git a/packages/connect-node-test/src/extra/create-grpc-definition.ts b/packages/connect-node-test/src/extra/create-grpc-definition.ts
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {
+import { MethodKind } from "@bufbuild/protobuf";
+import type {
   AnyMessage,
   BinaryReadOptions,
   BinaryWriteOptions,
-  MethodKind,
   PartialMessage,
   ServiceType,
 } from "@bufbuild/protobuf";

diff --git a/packages/connect-node-test/src/helpers/test-routes.ts b/packages/connect-node-test/src/helpers/test-routes.ts
@@ -15,11 +15,10 @@
 import {
   Code,
   ConnectError,
-  ConnectRouter,
   decodeBinaryHeader,
   encodeBinaryHeader,
-  ServiceImpl,
 } from "@bufbuild/connect";
+import type { ConnectRouter, ServiceImpl } from "@bufbuild/connect";
 import { TestService } from "../gen/grpc/testing/test_connect.js";
 import type { StreamingOutputCallRequest } from "../gen/grpc/testing/messages_pb.js";
 import { interop } from "./interop.js";

diff --git a/packages/connect-node-test/src/helpers/testserver.ts b/packages/connect-node-test/src/helpers/testserver.ts
@@ -28,8 +28,8 @@ import {
 } from "@bufbuild/connect-node";
 import { fastifyConnectPlugin } from "@bufbuild/connect-fastify";
 import { expressConnectMiddleware } from "@bufbuild/connect-express";
-import {
-  fastify,
+import { fastify } from "fastify";
+import type {
   FastifyBaseLogger,
   FastifyInstance,
   FastifyTypeProviderDefault,

diff --git a/packages/connect-node-test/src/node-readme.spec.ts b/packages/connect-node-test/src/node-readme.spec.ts
@@ -14,7 +14,8 @@
 
 import * as http2 from "http2";
 import { Message, MethodKind, proto3 } from "@bufbuild/protobuf";
-import { ConnectRouter, createPromiseClient } from "@bufbuild/connect";
+import { createPromiseClient } from "@bufbuild/connect";
+import type { ConnectRouter } from "@bufbuild/connect";
 import {
   connectNodeAdapter,
   createGrpcTransport,

diff --git a/packages/connect-node/package.json b/packages/connect-node/package.json
@@ -11,7 +11,7 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types",
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types",
     "jasmine": "jasmine --config=jasmine.json"
   },
   "main": "./dist/cjs/index.js",

diff --git a/packages/connect-node/src/connect-node-adapter.ts b/packages/connect-node/src/connect-node-adapter.ts
@@ -15,18 +15,19 @@
 import {
   Code,
   connectErrorFromReason,
-  ConnectRouter,
-  ConnectRouterOptions,
   createConnectRouter,
 } from "@bufbuild/connect";
+import type { ConnectRouter, ConnectRouterOptions } from "@bufbuild/connect";
 import type { UniversalHandler } from "@bufbuild/connect/protocol";
 import { uResponseNotFound } from "@bufbuild/connect/protocol";
 import {
+  universalRequestFromNodeRequest,
+  universalResponseToNodeResponse,
+} from "./node-universal-handler.js";
+import type {
   NodeHandlerFn,
   NodeServerRequest,
   NodeServerResponse,
-  universalRequestFromNodeRequest,
-  universalResponseToNodeResponse,
 } from "./node-universal-handler.js";
 import { compressionBrotli, compressionGzip } from "./compression.js";
 

diff --git a/packages/connect-node/src/connect-transport.ts b/packages/connect-node/src/connect-transport.ts
@@ -21,10 +21,10 @@ import type {
 import type { Interceptor, Transport } from "@bufbuild/connect";
 import type { Compression } from "@bufbuild/connect/protocol";
 import { createTransport } from "@bufbuild/connect/protocol-connect";
-import {
+import { validateNodeTransportOptions } from "./validate-node-transport-options.js";
+import type {
   NodeHttp1TransportOptions,
   NodeHttp2TransportOptions,
-  validateNodeTransportOptions,
 } from "./validate-node-transport-options.js";
 
 /**

diff --git a/packages/connect-web-bench/README.md b/packages/connect-web-bench/README.md
@@ -10,5 +10,5 @@ it like a web server would usually do.
 
 | code generator | bundle size        | minified               | compressed           |
 |----------------|-------------------:|-----------------------:|---------------------:|
-| connect        | 107,215 b | 46,955 b | 12,525 b |
+| connect        | 107,197 b | 46,935 b | 12,539 b |
 | grpc-web       | 414,906 b    | 301,127 b    | 53,279 b |
diff --git a/packages/connect-web-test/package.json b/packages/connect-web-test/package.json
@@ -4,7 +4,7 @@
   "scripts": {
     "clean": "rm -rf ./dist/esm/*",
     "generate": "buf generate",
-    "build": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm",
+    "build": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm",
     "jasmine": "jasmine --config=jasmine.json",
     "karma": "karma start karma.conf.cjs",
     "karma-serve": "karma start karma.serve.conf.cjs",

diff --git a/packages/connect-web-test/src/cancellation.spec.ts b/packages/connect-web-test/src/cancellation.spec.ts
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 import {
-  CallOptions,
   Code,
   ConnectError,
   createCallbackClient,
   createPromiseClient,
 } from "@bufbuild/connect";
+import type { CallOptions } from "@bufbuild/connect";
 import { describeTransports } from "./helpers/crosstestserver.js";
 import { TestService } from "./gen/grpc/testing/test_connect.js";
 

diff --git a/packages/connect-web/package.json b/packages/connect-web/package.json
@@ -12,7 +12,7 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types"
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",

diff --git a/packages/connect-web/src/connect-transport.ts b/packages/connect-web/src/connect-transport.ts
@@ -12,32 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {
+import { Message, MethodKind } from "@bufbuild/protobuf";
+import type {
   AnyMessage,
   BinaryReadOptions,
   BinaryWriteOptions,
   JsonReadOptions,
   JsonValue,
   JsonWriteOptions,
-  Message,
   MethodInfo,
-  MethodKind,
   PartialMessage,
   ServiceType,
 } from "@bufbuild/protobuf";
-import type {
-  Interceptor,
-  Transport,
-  UnaryRequest,
-  UnaryResponse,
-} from "@bufbuild/connect";
 import {
   appendHeaders,
   Code,
   connectErrorFromReason,
   runStreaming,
   runUnary,
+} from "@bufbuild/connect";
+import type {
+  Interceptor,
   StreamResponse,
+  Transport,
+  UnaryRequest,
+  UnaryResponse,
 } from "@bufbuild/connect";
 import {
   createClientMethodSerializers,

diff --git a/packages/connect-web/src/grpc-web-transport.ts b/packages/connect-web/src/grpc-web-transport.ts
@@ -12,25 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {
+import { Message, MethodKind } from "@bufbuild/protobuf";
+import type {
   AnyMessage,
   BinaryReadOptions,
   BinaryWriteOptions,
   JsonReadOptions,
   JsonWriteOptions,
-  Message,
   MethodInfo,
-  MethodKind,
   PartialMessage,
   ServiceType,
 } from "@bufbuild/protobuf";
 import type { UnaryRequest } from "@bufbuild/connect";
 import {
   Code,
   connectErrorFromReason,
-  Interceptor,
   runStreaming,
   runUnary,
+} from "@bufbuild/connect";
+import type {
+  Interceptor,
   StreamResponse,
   Transport,
   UnaryResponse,

diff --git a/packages/connect-web/src/index.ts b/packages/connect-web/src/index.ts
@@ -21,8 +21,6 @@ export type { GrpcWebTransportOptions } from "./grpc-web-transport.js";
 // please please import from @bufbuild/connect instead
 // TODO(TCN-1261)
 import {
-  CallbackClient,
-  CallOptions,
   Code,
   ConnectError,
   connectErrorDetails,
@@ -31,6 +29,10 @@ import {
   createPromiseClient,
   decodeBinaryHeader,
   encodeBinaryHeader,
+} from "@bufbuild/connect";
+import type {
+  CallbackClient,
+  CallOptions,
   Interceptor,
   PromiseClient,
   StreamRequest,

diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -14,7 +14,7 @@
     "generate": "buf generate src/protocol-grpc/proto",
     "build": "npm run build:cjs && npm run build:esm+types",
     "build:cjs": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types && echo >./dist/esm/package.json '{\"type\":\"module\", \"sideEffects\":false}'",
+    "build:esm+types": "tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/types && echo >./dist/esm/package.json '{\"type\":\"module\", \"sideEffects\":false}'",
     "jasmine": "jasmine --config=jasmine.json"
   },
   "main": "./dist/cjs/index.js",

diff --git a/packages/connect/src/connect-error.ts b/packages/connect/src/connect-error.ts
@@ -13,12 +13,11 @@
 // limitations under the License.
 
 import { Code } from "./code.js";
-import {
+import { createRegistry, Message } from "@bufbuild/protobuf";
+import type {
   AnyMessage,
-  createRegistry,
   IMessageTypeRegistry,
   JsonValue,
-  Message,
   MessageType,
 } from "@bufbuild/protobuf";
 import { codeToString } from "./protocol-connect/index.js";