Skip to content

minor dev improvements #21

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
timbod7 merged 2 commits into from
Apr 14, 2025
Merged

minor dev improvements #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2867fc3
minor dev improvements:
timbod7 Apr 14, 2025
d1e34b7
use a custom error for adl compilation to control whethere tracebacks…
timbod7 Apr 14, 2025
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: 2 additions & 2 deletions deno.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"lock": "./deno/deno.lock",
"tasks" : {
"genadl" : "deno run --check=all --allow-all deno/genadl.ts && cd ts && pnpm install",
"genadl" : "deno run --quiet --check=all --allow-all deno/genadl.ts && cd ts && pnpm install",
"build-server-image": "cd rust/server && docker build --tag protoapp-server:latest .",
"build-ui-image": "cd ts/ui && docker build --file Dockerfile --tag protoapp-ui:latest .."
},
"imports": {
"@adllang/local-setup": "jsr:@adllang/local-setup@^0.16.0",
"@adllang/adl-runtime": "jsr:@adllang/adl-runtime@^0.1.0",
"@adllang/adlc-tools": "jsr:@adllang/adlc-tools@^0.1.4",
"@adllang/adlc-tools": "jsr:@adllang/adlc-tools@^0.1.5",
"@mesqueeb/case-anything": "jsr:@mesqueeb/case-anything@^3.1.0",
"@std/path": "jsr:@std/path@^1.0.8",
"mustache_ts": "https://deno.land/x/mustache_ts@v0.4.1.1/mustache.ts"
Expand Down
35 changes: 27 additions & 8 deletions deno/deno.lock
View file
Open in desktop

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

15 changes: 11 additions & 4 deletions deno/genadl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from "@std/path";
import { genRust, genTypescript } from "@adllang/adlc-tools";
import { AdlcError, genRust, genTypescript } from "@adllang/adlc-tools";

import { genAdlTsPackage } from "./gen-adl-ts-package.ts";
import { genCreateSqlSchema } from "./gen-sqlschema.ts";
Expand Down Expand Up @@ -93,6 +93,13 @@ export function getRepoRoot(): string {
return path.dirname(path.dirname(modulepath));
}

main().catch((err) => {
console.error("error in main", err);
});
try {
await main();
} catch (e: unknown) {
if (e instanceof AdlcError && e.showTraceback === false) {
console.error(e.message);
} else {
console.error(e);
}
Deno.exit(1);
}
2 changes: 1 addition & 1 deletion rust/rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.85.1"
components = ["clippy", "rustfmt"]
components = ["clippy", "rustfmt", "rust-analyzer"]