Add test setup for the @bufbuild/connect-node package (#547)

connectrpc · Mar 27, 2023 · c18d298 · c18d298
1 parent 27bcb7b
commit c18d298
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -170,12 +170,16 @@ clean: crosstestserverstop ## Delete build artifacts and installed dependencies
 build: $(BUILD)/connect $(BUILD)/connect-web $(BUILD)/connect-node $(BUILD)/connect-fastify $(BUILD)/connect-express $(BUILD)/connect-next $(BUILD)/protoc-gen-connect-es $(BUILD)/protoc-gen-connect-web $(BUILD)/example ## Build
 
 .PHONY: test
-test: testcore testnode testwebnode testwebbrowser ## Run all tests, except browserstack
+test: testconnectpackage testconnectnodepackage testnode testwebnode testwebbrowser ## Run all tests, except browserstack
 
-.PHONY: testcore
-testcore: $(BUILD)/connect
+.PHONY: testconnectpackage
+testconnectpackage: $(BUILD)/connect
 	npm run -w packages/connect jasmine
 
+.PHONY: testconnectnodepackage
+testconnectnodepackage: $(BUILD)/connect-node
+	npm run -w packages/connect-node jasmine
+
 .PHONY: testnode
 testnode: $(BIN)/node16 $(BIN)/node17 $(BIN)/node18 $(BIN)/node19 $(BUILD)/connect-node-test
 	$(MAKE) crosstestserverrun

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

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

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

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

diff --git a/packages/connect-node/.npmignore b/packages/connect-node/.npmignore
@@ -0,0 +1,4 @@
+/src
+/*.json
+/dist/*/**/*.spec.js
+/dist/*/**/*.spec.d.ts
diff --git a/packages/connect-node/jasmine.json b/packages/connect-node/jasmine.json
@@ -0,0 +1,9 @@
+{
+  "spec_dir": "dist/esm",
+  "spec_files": ["**/*.spec.js"],
+  "helpers": [],
+  "env": {
+    "stopSpecOnExpectationFailure": false,
+    "random": true
+  }
+}
diff --git a/packages/connect-node/package.json b/packages/connect-node/package.json
@@ -10,8 +10,9 @@
   "scripts": {
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "build": "npm run build:cjs && npm run build:esm+types",
-    "build:cjs": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "npx tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/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",
+    "jasmine": "jasmine --config=jasmine.json"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",
@@ -31,6 +32,10 @@
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.0.0"
   },
+  "devDependencies": {
+    "@types/jasmine": "^4.3.1",
+    "jasmine": "^4.6.0"
+  },
   "files": [
     "dist/**"
   ]

diff --git a/packages/connect-node/src/node-universal-header.spec.ts b/packages/connect-node/src/node-universal-header.spec.ts
@@ -0,0 +1,24 @@
+// Copyright 2021-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { nodeHeaderToWebHeader } from "./node-universal-header.js";
+
+describe("nodeHeaderToWebHeader", function () {
+  it("should accept empty node header", function () {
+    const h = nodeHeaderToWebHeader({});
+    let numHeaders = 0;
+    h.forEach(() => numHeaders++);
+    expect(numHeaders).toBe(0);
+  });
+});
diff --git a/packages/connect-node/tsconfig.json b/packages/connect-node/tsconfig.json
@@ -1,4 +1,5 @@
 {
   "files": ["src/index.ts"],
+  "include": ["src/**/*.spec.ts"],
   "extends": "../../tsconfig.base.json"
 }
diff --git a/packages/connect-web-test/package.json b/packages/connect-web-test/package.json
@@ -4,11 +4,11 @@
   "scripts": {
     "clean": "rm -rf ./dist/esm/*",
     "generate": "buf generate",
-    "build": "npx tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm",
-    "jasmine": "../../node_modules/.bin/jasmine --config=jasmine.json",
-    "karma": "../../node_modules/.bin/karma start karma.conf.cjs",
-    "karma-serve": "../../node_modules/.bin/karma start karma.serve.conf.cjs",
-    "karma-browserstack": "../../node_modules/.bin/karma start karma.browserstack.conf.cjs"
+    "build": "tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm",
+    "jasmine": "jasmine --config=jasmine.json",
+    "karma": "karma start karma.conf.cjs",
+    "karma-serve": "karma start karma.serve.conf.cjs",
+    "karma-browserstack": "karma start karma.browserstack.conf.cjs"
   },
   "type": "module",
   "types": "./dist/types/index.d.ts",

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

diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -13,9 +13,9 @@
     "clean": "rm -rf ./dist/cjs/* ./dist/esm/* ./dist/types/*",
     "generate": "buf generate src/protocol-grpc/proto",
     "build": "npm run build:cjs && npm run build:esm+types",
-    "build:cjs": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm+types": "npx tsc --project tsconfig.json --module ES2015 --outDir ./dist/esm --declaration --declarationDir ./dist/types",
-    "jasmine": "../../node_modules/.bin/jasmine --config=jasmine.json"
+    "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",
+    "jasmine": "jasmine --config=jasmine.json"
   },
   "main": "./dist/cjs/index.js",
   "type": "module",

diff --git a/packages/protoc-gen-connect-es/package.json b/packages/protoc-gen-connect-es/package.json
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist/cjs/*",
-    "build": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
+    "build": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
   },
   "preferUnplugged": true,
   "dependencies": {

diff --git a/packages/protoc-gen-connect-web/package.json b/packages/protoc-gen-connect-web/package.json
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist/cjs/*",
-    "build": "npx tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
+    "build": "tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
   },
   "preferUnplugged": true,
   "dependencies": {