keryx 0.10.2 → 0.10.4

package/initializers/db.ts

@@ -3,6 +3,7 @@ import { type Config as DrizzleMigrateConfig } from "drizzle-kit";
 import { DefaultLogger, type LogWriter, sql } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
+import fs from "node:fs";
 import { unlink } from "node:fs/promises";
 import path from "path";
 import { Pool } from "pg";
@@ -68,9 +69,18 @@ export class DB extends Initializer {
 
     if (config.database.autoMigrate) {
       try {
-        await migrate(api.db.db, {
-          migrationsFolder: path.join(api.rootDir, "drizzle"),
-        });
+        const migrationsFolder = path.join(api.rootDir, "drizzle");
+        const journalPath = path.join(
+          migrationsFolder,
+          "meta",
+          "_journal.json",
+        );
+        if (!fs.existsSync(journalPath)) {
+          fs.mkdirSync(path.dirname(journalPath), { recursive: true });
+          fs.writeFileSync(journalPath, JSON.stringify({ entries: [] }));
+          logger.info("created empty drizzle migrations journal");
+        }
+        await migrate(api.db.db, { migrationsFolder });
         logger.info("database migrated successfully");
       } catch (e) {
         throw new TypedError({
@@ -103,7 +113,7 @@ export class DB extends Initializer {
   async generateMigrations() {
     const migrationConfig = {
       dialect: "postgresql",
-      schema: path.join("models", "*"),
+      schema: path.join("schema", "*"),
       dbCredentials: {
         url: config.database.connectionString,
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keryx",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "module": "index.ts",
   "type": "module",
   "license": "MIT",

package/templates/scaffold/gitignore.mustache

@@ -1,3 +1,3 @@
 node_modules/
 .env
-drizzle/
+drizzle/config.tmp.ts

package/util/cli.ts

@@ -62,14 +62,15 @@ export async function buildProgram(opts: {
       const files = await scaffoldProject(projectName, targetDir, options);
       files.forEach((f) => console.log(`  ${f}`));
 
-      console.log(`
-Done! To get started:
-
-  cd ${projectName}
-  cp .env.example .env
-  bun install
-  bun dev
-`);
+      const steps = [`  cd ${projectName}`, `  cp .env.example .env`];
+      if (options.includeDb) {
+        steps.push(`  createdb ${projectName}`);
+        steps.push(`  createdb ${projectName}-test`);
+      }
+      steps.push(`  bun install`);
+      steps.push(`  bun dev`);
+
+      console.log(`\nDone! To get started:\n\n${steps.join("\n")}\n`);
       process.exit(0);
     });
 

package/util/scaffold.ts

@@ -291,7 +291,7 @@ export async function scaffoldProject(
   if (options.includeDb) {
     await writeTemplate("migrations.ts", "migrations.ts.mustache");
     await write("schema/.gitkeep", "");
-    await write("drizzle/.gitkeep", "");
+    await write("drizzle/meta/_journal.json", JSON.stringify({ entries: [] }));
   }
 
   // --- Built-in actions (always included) ---