Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenstackhq/proxy",
"version": "0.2.3",
"version": "0.2.4",
"description": "A CLI tool to run an Express server that proxies CRUD requests to a ZenStack backend",
"main": "index.js",
"publishConfig": {
Expand Down
3 changes: 3 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ export default async function () {
// ignore
exitCode = e.exitCode
} else if (e instanceof CliError) {
telemetry.trackError(e)
console.error(red(e.message))
} else {
if (e instanceof Error) {
telemetry.trackError(e)
console.error(red(`Unhandled error: ${e.message}`))
} else {
telemetry.trackError(new Error(String(e)))
console.error(red(`Unhandled error: ${String(e)}`))
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/zmodel-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ function parseDatasource(
const urlFn = new Function('env', `return ${urlValueStr}`)
url = urlFn(env)
} catch (evalError) {
if (evalError instanceof CliError) {
throw evalError
}
throw new CliError(
'Could not evaluate datasource url from schema, you could provide it via -d option.'
)
Expand Down
Loading