ut-code · aster-void · Feb 15, 2025 · Feb 14, 2025 · Feb 15, 2025 · Feb 15, 2025
diff --git a/bun.lock b/bun.lock
diff --git a/common/lib/panic.ts b/common/lib/panic.ts
@@ -0,0 +1,11 @@
+// unexpected error
+export function panic(reason: string): never {
+  throw new Error(reason, {
+    cause: "panic",
+  });
+}
+
+// expected error
+export function error(reason: string, code?: number): never {
+  throw new Error(reason, { cause: code });
+}
diff --git a/common/lib/result.ts b/common/lib/result.ts
diff --git a/common/lib/result/safeParseInt.ts b/common/lib/result/safeParseInt.ts
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -13,8 +13,7 @@
 
     prisma-utils = {
       url = "github:VanCoding/nix-prisma-utils";
-      # HACK: they have named nixpkgs pkgs. I'm submitting a fix PR soon, rename this to `inputs.nixpkgs.follows` when that gets merged.
-      inputs.pkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 

diff --git a/server/package.json b/server/package.json
@@ -16,13 +16,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "common": "workspace:common",
     "@prisma/client": "^5.20.0",
+    "common": "workspace:common",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "dotenv-cli": "^7.4.2",
     "express": "^4.18.2",
+    "express-async-errors": "^3.1.1",
     "firebase-admin": "^12.2.0",
     "sharp": "^0.33.5",
     "socket.io": "^4.7.5",

diff --git a/server/prisma.nix b/server/prisma.nix
@@ -5,7 +5,7 @@
   prisma =
     (prisma-utils.lib.prisma-factory
       {
-        nixpkgs = pkgs;
+        inherit pkgs;
         prisma-fmt-hash = "sha256-atD5GZfmeU86mF1V6flAshxg4fFR2ews7EwaJWZZzbc=";
         query-engine-hash = "sha256-8FTZaKmQCf9lrDQvkF5yWPeZ7TSVfFjTbjdbWWEHgq4=";
         libquery-engine-hash = "sha256-USIdaum87ekGY6F6DaL/tKH0BAZvHBDK7zjmCLo//kM=";