fix(config): use biome for all

Author: aster-void

.github/workflows/static.yml

@@ -17,11 +17,10 @@ jobs:
         with:
           bun-version: 1.2.2
       - uses: biomejs/setup-biome@v2
-      - uses: denoland/setup-deno@v2
       - run: bun install --frozen-lockfile
       - run: bun check
       - run: biome lint .
-      - run: deno fmt --check
+      - run: biome format .
   nix-checks:
     name: Nix checks
     runs-on: ubuntu-latest

.helix/languages.toml

@@ -1,5 +1,5 @@
-[language-server]
-deno = { command = "deno", args = ["lsp"] }
+# [language-server]
+# deno = { command = "deno", args = ["lsp"] }
 
 [[language]]
 name = "nix"
@@ -30,4 +30,8 @@ language-servers = ["tailwindcss-ls", "svelteserver"]
 
 [[language]]
 name = "typescript"
-formatter = { command = "deno", args = ["fmt", "-"] }
+formatter = { command = "biome", args = [
+  "format",
+  "--stdin-file-path",
+  "a.ts",
+] }

biome.jsonc

@@ -10,7 +10,8 @@
     "ignore": []
   },
   "formatter": {
-    "enabled": false, // turned off until HTML + svelte full support
+    "enabled": true, // HTML-ish support when?
+    "lineWidth": 120,
     "indentStyle": "space",
     "indentWidth": 2
   },

deno.jsonc

@@ -30,10 +30,10 @@ pre-commit:
       run: cd service; bun run cf-typegen
       stage_fixed: true
     # JS
-    deno-fmt:
+    biome-fmt:
       tags: js style
       glob: "*.{js,ts,svelte,html,md}"
-      run: deno fmt {staged_files}
+      run: biome format {staged_files} --fix
       stage_fixed: true
     biome-lint:
       tags: js lint

lefthook.yml

@@ -15,9 +15,9 @@
     ":dev": "trap 'kill 0' EXIT; (cd web; bun run dev) & (cd service; bun run dev) & wait",
     "check": "bun check:style && bun check:type",
     "check:type": "(cd web && bun check:type) && (cd service && bun check:type) && (cd share && bun run check:type)",
-    "check:style": "deno fmt --check . && biome lint .",
+    "check:style": "biome check .",
     "fix": "bun fix:style",
-    "fix:style": "deno fmt . && biome lint --fix .",
+    "fix:style": "biome check --fix .",
     "db": "cd service; rm ../local.db; DATABASE_URL=file:../local.db bun db push --force",
     "build": "(cd service && bun run build) && (cd web && bun run build)",
     "test": "cd share; bun run test",

package.json

@@ -13,23 +13,25 @@ import preferenceRoutes from "./preferences.ts";
 
 const route = new Hono<HonoOptions>()
   .route("/:projectId/preferences", preferenceRoutes)
+
   .get("/mine", async (c) => {
     const browser_id = await getBrowserID(c);
     const project_resp = await db(c)
       .select()
       .from(projects)
       .innerJoin(participants, eq(projects.id, participants.project_id))
       .where(eq(participants.browser_id, browser_id));
-    return c.json(project_resp.map(
-      (p) => ({
+    return c.json(
+      project_resp.map((p) => ({
         id: p.projects.id,
         name: p.projects.name,
         description: p.projects.description,
         closed_at: p.projects.closed_at,
         is_admin: p.participants.is_admin,
-      }),
-    ));
+      })),
+    );
   })
+
   .get(
     "/:projectId",
     param({
@@ -47,16 +49,21 @@ const route = new Hono<HonoOptions>()
         return project;
       });
 
-      const prev_participant_data = (await db(c).select({
-        id: participants.id,
-        name: participants.name,
-      }).from(participants).where(
-        and(
-          eq(participants.project_id, projectId),
-          eq(participants.browser_id, browser_id),
-          eq(participants.is_admin, 0),
-        ),
-      ))[0];
+      const prev_participant_data = (
+        await db(c)
+          .select({
+            id: participants.id,
+            name: participants.name,
+          })
+          .from(participants)
+          .where(
+            and(
+              eq(participants.project_id, projectId),
+              eq(participants.browser_id, browser_id),
+              eq(participants.is_admin, 0),
+            ),
+          )
+      )[0];
       // エンティティの roles と被るため role_resp
       const role_resp = db(c)
         .select({
@@ -67,17 +74,15 @@ const route = new Hono<HonoOptions>()
           prev: ratings.score,
         })
         .from(roles)
-        .where(eq(
-          roles.project_id,
-          projectId,
-        ))
+        .where(eq(roles.project_id, projectId))
         .leftJoin(
           ratings,
           and(
             eq(ratings.role_id, roles.id),
             eq(ratings.participant_id, prev_participant_data?.id ?? "never"), // omit if prev_userdata doesn't exist
           ),
-        ).execute();
+        )
+        .execute();
       return c.json({
         project: await project,
         roles: await role_resp,
@@ -89,15 +94,18 @@ const route = new Hono<HonoOptions>()
     const browser_id = await getBrowserID(c);
     const project_id = crypto.randomUUID();
     const body = c.req.valid("json");
-    const project_resp = (await db(c)
-      .insert(projects)
-      .values([
-        {
-          id: project_id,
-          name: body.name,
-          description: body.description,
-        },
-      ]).returning())[0];
+    const project_resp = (
+      await db(c)
+        .insert(projects)
+        .values([
+          {
+            id: project_id,
+            name: body.name,
+            description: body.description,
+          },
+        ])
+        .returning()
+    )[0];
     if (!project_resp) throw new HTTPException(500, { message: "failed to create project" });
     await db(c)
       .insert(participants)
@@ -121,7 +129,8 @@ const route = new Hono<HonoOptions>()
           max: r.max,
           project_id: project_id,
         })),
-      ).returning();
+      )
+      .returning();
     return c.json({
       ...project_resp,
       roles: roles_resp,

service/routes/projects/index.ts

@@ -9,9 +9,7 @@ pkgs.mkShell {
 
     # JS
     bun # runner / tester
-    biome # style checker / linter ... replaced by deno because biome doesn't support HTML and svelte
     nodejs-slim # required by drizzle?
-    deno # used to format svelte
 
     wrangler
 

shell.nix

@@ -1,22 +1,4 @@
 let
-  deno-includes = [
-    "*.css"
-    "*.html"
-    "*.js"
-    "*.json"
-    "*.jsonc"
-    "*.jsx"
-    "*.less"
-    "*.markdown"
-    "*.md"
-    "*.sass"
-    "*.scss"
-    "*.ts"
-    "*.tsx"
-    "*.yaml"
-    "*.yml"
-    "*.svelte"
-  ];
   global-excludes = [
     "node_modules"
     ".gitignore"
@@ -41,8 +23,6 @@ in {
     mdformat.enable = true;
 
     # JS
-    deno.enable = true;
-    deno.includes = deno-includes;
     biome.enable = true;
 
     # Nix