Biome (#53)

Author: samuelcolvin

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     rev: v2.3.0
     hooks:
       - id: codespell
-        args: ['--skip=*.snap']
+        args: ["--skip=*.snap"]
 
   - repo: local
     hooks:
@@ -31,13 +31,6 @@ repos:
         language: system
         types_or: [javascript, ts, json]
         pass_filenames: false
-      - id: lint-ts
-        name: lint typescript
-        entry: make
-        args: [lint-ts]
-        language: system
-        types_or: [javascript, ts, json]
-        pass_filenames: false
       - id: typecheck-ts
         name: typecheck typescript
         entry: make

.prettierignore

@@ -1,7 +1,39 @@
 {
   "languages": {
+    "JavaScript": {
+      "formatter": { "language_server": { "name": "biome" } },
+      "code_actions_on_format": {
+        "source.fixAll.biome": true,
+        "source.organizeImports.biome": true
+      }
+    },
     "TypeScript": {
-      "formatter": { "external": { "command": "npx", "arguments": ["prettier", "--stdin-filepath", "{buffer_path}"] } }
+      "formatter": { "language_server": { "name": "biome" } },
+      "code_actions_on_format": {
+        "source.fixAll.biome": true,
+        "source.organizeImports.biome": true
+      }
+    },
+    "TSX": {
+      "formatter": { "language_server": { "name": "biome" } },
+      "code_actions_on_format": {
+        "source.fixAll.biome": true,
+        "source.organizeImports.biome": true
+      }
+    },
+    "JSON": { "formatter": { "language_server": { "name": "biome" } } },
+    "JSONC": { "formatter": { "language_server": { "name": "biome" } } },
+    "CSS": {
+      "formatter": { "language_server": { "name": "biome" } },
+      "language_servers": ["tailwindcss-language-server", "..."]
+    }
+  },
+  "lsp": {
+    "biome": {
+      "settings": {
+        "require_config_file": true,
+        "config_path": "<path>/biome.jsonc"
+      }
     }
   }
 }

.zed/settings.json

@@ -0,0 +1,60 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "ignoreUnknown": false
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "lineWidth": 119
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "suspicious": {
+        "useAwait": "error"
+      },
+      "style": {
+        "noNonNullAssertion": "off",
+        // maybe but seems unnecessarily opinionated
+        "useTemplate": "off",
+        // could anable this, but it's annoying with `...API` etc.
+        // "useNamingConvention": "error",
+        "noRestrictedImports": "error"
+      },
+      "nursery": {
+        "recommended": true,
+        "noFloatingPromises": "error"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "all",
+      "quoteStyle": "single",
+      "semicolons": "asNeeded"
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  },
+  "overrides": [
+    {
+      "includes": ["**/*.ts"],
+      "formatter": {
+        "expand": "never"
+      }
+    }
+  ]
+}

biome.jsonc

@@ -1,5 +1,5 @@
-import type { Config } from '@deploy/types'
 import { env } from 'cloudflare:workers'
+import type { Config } from '@deploy/types'
 
 // can be whatever you want, just used to make linking apiKeys to providers typesafe.
 type ProviderKeys = 'a' | 'b' | 'c' | 'd'

deploy/example.config.ts

@@ -12,7 +12,7 @@
     "limits-remote-db": "wrangler d1 execute pydantic-ai-gateway-limits --remote --file ../gateway/limits-schema.sql",
     "wrangler-secret-put": "wrangler secret put",
     "generate-api-key": "node generate_api_key.js",
-    "typegen": "wrangler types --strict-vars false --include-runtime false && prettier worker-configuration.d.ts --write"
+    "typegen": "wrangler types --strict-vars false --include-runtime false"
   },
   "dependencies": {
     "@pydantic/logfire-api": "^0.8.1",

deploy/package.json

@@ -1,4 +1,4 @@
-import { ApiKeyInfo, KeysDbD1, KeyStatus, ProviderProxy } from '@pydantic/ai-gateway'
+import { type ApiKeyInfo, type KeyStatus, KeysDbD1, type ProviderProxy } from '@pydantic/ai-gateway'
 import { config } from './config'
 
 export class ConfigDB extends KeysDbD1 {

deploy/src/db.ts

@@ -15,10 +15,10 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { GatewayEnv, gatewayFetch, LimitDbD1 } from '@pydantic/ai-gateway'
+import { env } from 'cloudflare:workers'
+import { type GatewayEnv, gatewayFetch, LimitDbD1 } from '@pydantic/ai-gateway'
 import * as logfire from '@pydantic/logfire-api'
 import { instrument } from '@pydantic/logfire-cf-workers'
-import { env } from 'cloudflare:workers'
 import { config } from './config'
 import { ConfigDB, hash } from './db'
 import { status } from './status'

deploy/src/index.ts

@@ -1,4 +1,4 @@
-import { LimitDb, SpendStatus } from '@pydantic/ai-gateway'
+import type { LimitDb, SpendStatus } from '@pydantic/ai-gateway'
 import { config } from './config'
 
 interface EntityStatus {
@@ -80,7 +80,7 @@ function auth(request: Request, env: Env): Response | 'ok' {
 
   const authHeader = request.headers.get('authorization')
 
-  let key
+  let key: string
   if (authHeader) {
     if (authHeader.toLowerCase().startsWith('bearer ')) {
       key = authHeader.substring(7)

deploy/src/status.ts

@@ -1,4 +1,4 @@
-import { OtelSettings, ProviderProxy } from '@pydantic/ai-gateway'
+import type { OtelSettings, ProviderProxy } from '@pydantic/ai-gateway'
 
 export interface Config<ProviderKey extends string = string> {
   /** @param team: record keys are the team ids */