Skip to content

Add check for error type #8

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

Merged
merged 6 commits into from
Jul 19, 2023
Merged

Add check for error type #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c57e414
Add check for error instanceof error
AlexanderKolberg Jul 19, 2023
0c58838
Regenerate client with new error
AlexanderKolberg Jul 19, 2023
b565b77
Add ts check to tests
AlexanderKolberg Jul 19, 2023
f39c644
Regenearte client contract with v0.11
AlexanderKolberg Jul 19, 2023
0579d1b
Fix ts-check in pipline
AlexanderKolberg Jul 19, 2023
e1a27e0
Remove wrong tsc package
AlexanderKolberg Jul 19, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Git diff of regenerated files
run: cd _examples && make diff

webrpc-interoperability:
webrpc-tests:
strategy:
matrix:
webrpc-version: [v0.11.0]
Expand All @@ -55,3 +55,5 @@ jobs:
run: cd tests && echo "$PWD/bin/${{ matrix.webrpc-version }}" >> $GITHUB_PATH
- name: Run interoperability tests
run: cd tests && ./test.sh
- name: Run typescript check
run: cd tests && npm run ts-check
6 changes: 5 additions & 1 deletion _examples/node-ts/webapp/client.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,13 @@ const buildResponse = (res: Response): Promise<any> => {
try {
data = JSON.parse(text)
} catch(error) {
let message = ''
if (error instanceof Error) {
message = error.message
}
throw WebrpcBadResponseError.new({
status: res.status,
cause: `JSON.parse(): ${error.message || ''}: response text: ${text}`},
cause: `JSON.parse(): ${message}: response text: ${text}`},
)
}
if (!res.ok) {
Expand Down
6 changes: 5 additions & 1 deletion clientHelpers.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ const buildResponse = (res: Response): Promise<any> => {
try {
data = JSON.parse(text)
} catch(error) {
let message = ''
if (error instanceof Error) {
message = error.message
}
throw WebrpcBadResponseError.new({
status: res.status,
cause: `JSON.parse(): ${error.message || ''}: response text: ${text}`},
cause: `JSON.parse(): ${message}: response text: ${text}`},
)
}
if (!res.ok) {
Expand Down
24 changes: 22 additions & 2 deletions tests/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.

5 changes: 4 additions & 1 deletion tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"main": "index.js",
"scripts": {
"test": "./test.sh",
"vitest": "./node_modules/.bin/vitest run --reporter verbose --dir ./"
"vitest": "./node_modules/.bin/vitest run --reporter verbose --dir ./",
"prets-check": "webrpc-gen -schema=./test.ridl -target=../ -client -out=./client.ts",
"ts-check": "tsc --noEmit ./client.ts"
},
"repository": {
"type": "git",
Expand All @@ -18,6 +20,7 @@
},
"homepage": "https://github.com/webrpc/gen-typescript#readme",
"devDependencies": {
"typescript": "^5.1.6",
"vitest": "^0.25.6"
},
"engines": {
Expand Down