refactor(micro): move D1 schema, migrations, and drizzle config into micro package

just-be-dev · claude · just-be-dev · commit 1413f5d6d8e6 · 2026-03-18T06:02:16.000-04:00
- Move db/schema.ts, db/migrations/, and drizzle.config.ts into packages/micro/
- Add loader-db.ts with a D1 HTTP adapter so drizzle can be used at build time
- Rewrite micro-loader to import getMicroPosts from @just-be/micro/loader-db
  instead of hitting the Cloudflare API directly with raw SQL
- Add exports field to micro package.json for the loader-db entrypoint
- Add mise tasks for micro:db:generate and micro:db:migrate
- Remove drizzle-kit, drizzle-orm, and db:* scripts from root package.json

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/mise.toml b/mise.toml
@@ -93,3 +93,13 @@ description = "Preview release notes for a package version"
 run = "bun packages/micro/index.ts"
 description = "Micro blog CLI (browse posts or create new ones)"
 raw = true
+
+[tasks."micro:db:generate"]
+dir = "packages/micro"
+run = "bun run db:generate"
+description = "Generate drizzle migrations for micro blog"
+
+[tasks."micro:db:migrate"]
+dir = "packages/micro"
+run = "bun run db:migrate"
+description = "Apply drizzle migrations for micro blog"
diff --git a/package.json b/package.json
@@ -25,9 +25,7 @@
     "test": "bun test",
     "gen-codes": "bun scripts/gen-codes.ts",
     "lint": "oxlint",
-    "lint:fix": "oxlint --fix",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "drizzle-kit migrate"
+    "lint:fix": "oxlint --fix"
   },
   "dependencies": {
     "@ascorbic/feed-loader": "^2.0.1",
@@ -41,8 +39,6 @@
     "@webtui/css": "^0.1.5",
     "astro": "6.0.4",
     "beautiful-mermaid": "^1.0.0",
-    "drizzle-kit": "^0.31.9",
-    "drizzle-orm": "^0.45.1",
     "js-yaml": "^4.1.1",
     "marked": "^17.0.1",
     "mdast-util-mdx-jsx": "^3.2.0",
diff --git a/packages/micro/db/migrations/0000_red_mother_askani.sql b/packages/micro/db/migrations/0000_red_mother_askani.sql
diff --git a/packages/micro/db/migrations/meta/0000_snapshot.json b/packages/micro/db/migrations/meta/0000_snapshot.json
diff --git a/packages/micro/db/migrations/meta/_journal.json b/packages/micro/db/migrations/meta/_journal.json
diff --git a/packages/micro/drizzle.config.ts b/packages/micro/drizzle.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from "drizzle-kit";
 
 export default defineConfig({
-  schema: "./db/schema.ts",
+  schema: "./src/schema.ts",
   out: "./db/migrations",
   dialect: "sqlite",
   driver: "d1-http",
diff --git a/packages/micro/package.json b/packages/micro/package.json
@@ -19,15 +19,25 @@
   },
   "files": [
     "index.ts",
-    "src"
+    "src",
+    "db"
   ],
   "type": "module",
+  "exports": {
+    ".": "./index.ts",
+    "./loader-db": "./src/loader-db.ts"
+  },
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "db:generate": "drizzle-kit generate",
+    "db:migrate": "drizzle-kit migrate"
+  },
   "dependencies": {
     "@atproto/api": "^0.15.3",
     "@clack/prompts": "^0.11.0",
+    "drizzle-kit": "^0.31.9",
     "drizzle-orm": "^0.45.1",
     "twitter-api-v2": "^1.17.3",
     "wrangler": "4.48.0"
diff --git a/packages/micro/src/db.ts b/packages/micro/src/db.ts
@@ -1,29 +1,13 @@
 import { drizzle } from "drizzle-orm/d1";
-import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
-import { sql } from "drizzle-orm";
+import { getPlatformProxy } from "wrangler";
+import { microPosts } from "./schema";
 
-// Re-define the schema locally for the CLI
-export const microPosts = sqliteTable("micro_posts", {
-  id: integer("id").primaryKey({ autoIncrement: true }),
-  content: text("content", { length: 280 }).notNull(),
-  createdAt: integer("created_at", { mode: "timestamp" })
-    .notNull()
-    .default(sql`(unixepoch())`),
-  updatedAt: integer("updated_at", { mode: "timestamp" })
-    .notNull()
-    .default(sql`(unixepoch())`)
-    .$onUpdate(() => new Date()),
-  syndicatedTo: text("syndicated_to", { mode: "json" })
-    .$type<string[]>()
-    .default(sql`'[]'`),
-});
+export { microPosts };
 
 export async function getD1Database() {
   // Use wrangler to get local D1 access
   // Find the project root (where wrangler.toml is)
   const projectRoot = import.meta.dir + "/../../..";
-
-  const { getPlatformProxy } = await import("wrangler");
   const { env, dispose } = await getPlatformProxy<{ DB: D1Database }>({
     configPath: `${projectRoot}/wrangler.toml`,
     persist: { path: `${projectRoot}/.wrangler/state/v3` },
diff --git a/packages/micro/src/loader-db.ts b/packages/micro/src/loader-db.ts
@@ -0,0 +1,13 @@
+import { desc } from "drizzle-orm";
+
+import { getD1Database } from "./db";
+import { microPosts } from "./schema";
+
+export async function getMicroPosts() {
+  const { db, dispose } = await getD1Database();
+  try {
+    return await db.select().from(microPosts).orderBy(desc(microPosts.createdAt));
+  } finally {
+    await dispose();
+  }
+}
diff --git a/packages/micro/src/schema.ts b/packages/micro/src/schema.ts
diff --git a/src/content.config.ts b/src/content.config.ts
@@ -138,13 +138,10 @@ const tags = defineCollection({
 });
 
 const micro = defineCollection({
-  loader: microLoader({
-    databaseId: process.env.D1_DATABASE_ID || "",
-    accountId: process.env.CLOUDFLARE_ACCOUNT_ID || "",
-    apiToken: process.env.CLOUDFLARE_API_TOKEN || "",
-  }),
+  loader: microLoader(),
   schema: microSchema,
 });
+
 export const collections = {
   blog,
   games,
diff --git a/src/loaders/micro-loader.ts b/src/loaders/micro-loader.ts
@@ -1,107 +1,32 @@
 import type { Loader } from "astro/loaders";
+import { getMicroPosts } from "@just-be/micro/loader-db";
 
-interface MicroLoaderOptions {
-  databaseId: string;
-  accountId: string;
-  apiToken: string;
-}
-
-interface MicroPost {
-  id: number;
-  content: string;
-  created_at: number;
-  updated_at: number;
-  syndicated_to: string;
-}
-
-export function microLoader(options: MicroLoaderOptions): Loader {
+export function microLoader(): Loader {
   return {
     name: "micro-loader",
     load: async ({ store, logger }) => {
       logger.info("Loading micro posts from D1");
 
-      // Skip loading if required credentials are missing
-      if (!options.databaseId || !options.accountId || !options.apiToken) {
-        logger.warn(
-          "Skipping micro posts: Missing D1 credentials (D1_DATABASE_ID, CLOUDFLARE_ACCOUNT_ID, or CLOUDFLARE_API_TOKEN)",
-        );
-        return;
-      }
-
       try {
-        const query =
-          "SELECT id, content, created_at, updated_at, syndicated_to FROM micro_posts ORDER BY created_at DESC";
-
-        const response = await fetch(
-          `https://api.cloudflare.com/client/v4/accounts/${options.accountId}/d1/database/${options.databaseId}/query`,
-          {
-            method: "POST",
-            headers: {
-              Authorization: `Bearer ${options.apiToken}`,
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              sql: query,
-            }),
-          },
-        );
-
-        if (!response.ok) {
-          throw new Error(`D1 API request failed: ${response.status} ${await response.text()}`);
-        }
-
-        const data = await response.json();
-
-        if (!data.success) {
-          throw new Error(`D1 query failed: ${JSON.stringify(data.errors)}`);
-        }
-
-        if (!Array.isArray(data.result) || data.result.length === 0) {
-          logger.warn("D1 query returned unexpected result structure");
-          return;
-        }
-
-        const resultRows = data.result[0]?.results;
-        if (!Array.isArray(resultRows)) {
-          logger.warn("D1 query results is not an array");
-          return;
-        }
-
-        const results = resultRows as MicroPost[];
-
-        // Store each post in the collection
-        for (const post of results) {
-          let syndicatedTo: string[] = [];
-          if (post.syndicated_to) {
-            try {
-              const parsed = JSON.parse(post.syndicated_to);
-              if (Array.isArray(parsed) && parsed.every((s) => typeof s === "string")) {
-                syndicatedTo = parsed;
-              } else {
-                logger.warn(`Invalid syndicated_to value for post ${post.id}, defaulting to []`);
-              }
-            } catch {
-              logger.warn(`Failed to parse syndicated_to for post ${post.id}, defaulting to []`);
-            }
-          }
+        const posts = await getMicroPosts();
 
+        for (const post of posts) {
           store.set({
             id: String(post.id),
             data: {
               content: post.content,
-              createdAt: new Date(post.created_at * 1000),
-              updatedAt: new Date(post.updated_at * 1000),
-              syndicatedTo,
+              createdAt: post.createdAt,
+              updatedAt: post.updatedAt,
+              syndicatedTo: (post.syndicatedTo ?? []).map((item) => item.url),
             },
           });
         }
 
-        logger.info(`Loaded ${results.length} micro posts`);
+        logger.info(`Loaded ${posts.length} micro posts`);
       } catch (error) {
-        logger.error(
-          `Failed to load micro posts: ${error instanceof Error ? error.message : String(error)}`,
+        logger.warn(
+          `Skipping micro posts: ${error instanceof Error ? error.message : String(error)}`,
         );
-        throw error;
       }
     },
   };
diff --git a/wrangler.toml b/wrangler.toml
@@ -13,4 +13,4 @@ binding = "ASSETS"
 binding = "DB"
 database_name = "micro-blog"
 database_id = "cc5c17ec-ad2f-41b5-8d5c-cf542604c43b"
-migrations_dir = "db/migrations"
+migrations_dir = "packages/micro/db/migrations"
