fossyl 0.9.0 → 0.10.0

package/README.md

@@ -0,0 +1,5 @@
+# fossyl
+
+CLI for scaffolding fossyl projects.
+
+For AI-assisted development, see [CLAUDE.md](./CLAUDE.md). Full documentation at [github.com/YoyoSaur/fossyl](https://github.com/YoyoSaur/fossyl).

package/dist/index.js

@@ -76,7 +76,30 @@ async function promptForOptions(projectName) {
     p.cancel("Operation cancelled.");
     return null;
   }
-  return { name, server, validator, database };
+  let dialect;
+  if (database === "kysely") {
+    dialect = await p.select({
+      message: "Database dialect:",
+      options: [
+        { value: "sqlite", label: "SQLite", hint: "recommended - great for per-customer databases" },
+        { value: "postgres", label: "PostgreSQL" },
+        { value: "mysql", label: "MySQL" }
+      ]
+    });
+    if (p.isCancel(dialect)) {
+      p.cancel("Operation cancelled.");
+      return null;
+    }
+  }
+  const docker = await p.confirm({
+    message: "Include Docker setup?",
+    initialValue: true
+  });
+  if (p.isCancel(docker)) {
+    p.cancel("Operation cancelled.");
+    return null;
+  }
+  return { name, server, validator, database, dialect, docker };
 }
 
 // src/scaffold.ts
@@ -105,8 +128,15 @@ function generatePackageJson(options) {
   if (options.database === "kysely") {
     dependencies["@fossyl/kysely"] = "^0.9.0";
     dependencies["kysely"] = "^0.27.0";
-    dependencies["pg"] = "^8.13.0";
-    devDependencies["@types/pg"] = "^8.11.0";
+    if (options.dialect === "sqlite") {
+      dependencies["better-sqlite3"] = "^11.0.0";
+      devDependencies["@types/better-sqlite3"] = "^7.6.0";
+    } else if (options.dialect === "mysql") {
+      dependencies["mysql2"] = "^3.11.0";
+    } else {
+      dependencies["pg"] = "^8.13.0";
+      devDependencies["@types/pg"] = "^8.11.0";
+    }
   }
   const pkg = {
     name: options.name === "." ? "my-fossyl-api" : options.name,
@@ -147,8 +177,17 @@ PORT=3000
   if (options.database === "kysely") {
     content += `
 # Database
-DATABASE_URL=postgres://user:password@localhost:5432/mydb
 `;
+    if (options.dialect === "sqlite") {
+      content += `DATABASE_PATH=./data/app.db
+`;
+    } else if (options.dialect === "mysql") {
+      content += `DATABASE_URL=mysql://user:password@localhost:3306/mydb
+`;
+    } else {
+      content += `DATABASE_URL=postgres://user:password@localhost:5432/mydb
+`;
+    }
   }
   return content;
 }
@@ -394,7 +433,39 @@ export function startServer(routes: Route[], port: number): void {
 }
 
 // src/templates/database/kysely.ts
-function generateKyselySetup() {
+function generateKyselySetup(dialect = "postgres") {
+  if (dialect === "sqlite") {
+    return `import Database from 'better-sqlite3';
+import { Kysely, SqliteDialect } from 'kysely';
+import type { DB } from './types/db';
+
+const databasePath = process.env.DATABASE_PATH || './data/app.db';
+
+export const db = new Kysely<DB>({
+  dialect: new SqliteDialect({
+    database: new Database(databasePath),
+  }),
+});
+`;
+  }
+  if (dialect === "mysql") {
+    return `import { createPool } from 'mysql2';
+import { Kysely, MysqlDialect } from 'kysely';
+import type { DB } from './types/db';
+
+const connectionString = process.env.DATABASE_URL;
+
+if (!connectionString) {
+  throw new Error('DATABASE_URL environment variable is required');
+}
+
+export const db = new Kysely<DB>({
+  dialect: new MysqlDialect({
+    pool: createPool(connectionString),
+  }),
+});
+`;
+  }
   return `import { Kysely, PostgresDialect } from 'kysely';
 import { Pool } from 'pg';
 import type { DB } from './types/db';
@@ -442,7 +513,53 @@ export const migrations = createMigrationProvider({
 });
 `;
 }
-function generatePingMigration() {
+function generatePingMigration(dialect = "postgres") {
+  if (dialect === "sqlite") {
+    return `import { sql } from 'kysely';
+import { defineMigration } from '@fossyl/kysely';
+
+export const migration = defineMigration({
+  async up(db) {
+    await db.schema
+      .createTable('ping')
+      .addColumn('id', 'text', (col) => col.primaryKey())
+      .addColumn('message', 'text', (col) => col.notNull())
+      .addColumn('created_by', 'text', (col) => col.notNull())
+      .addColumn('created_at', 'text', (col) =>
+        col.notNull().defaultTo(sql\`(datetime('now'))\`)
+      )
+      .execute();
+  },
+
+  async down(db) {
+    await db.schema.dropTable('ping').execute();
+  },
+});
+`;
+  }
+  if (dialect === "mysql") {
+    return `import { sql } from 'kysely';
+import { defineMigration } from '@fossyl/kysely';
+
+export const migration = defineMigration({
+  async up(db) {
+    await db.schema
+      .createTable('ping')
+      .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+      .addColumn('message', 'varchar(255)', (col) => col.notNull())
+      .addColumn('created_by', 'varchar(255)', (col) => col.notNull())
+      .addColumn('created_at', 'timestamp', (col) =>
+        col.notNull().defaultTo(sql\`CURRENT_TIMESTAMP\`)
+      )
+      .execute();
+  },
+
+  async down(db) {
+    await db.schema.dropTable('ping').execute();
+  },
+});
+`;
+  }
   return `import { sql } from 'kysely';
 import { defineMigration } from '@fossyl/kysely';
 
@@ -873,6 +990,98 @@ export async function remove(id: string): Promise<void> {
 `;
 }
 
+// src/templates/docker.ts
+function generateDockerfile() {
+  return `FROM node:20-alpine
+WORKDIR /app
+COPY package*.json pnpm-lock.yaml* ./
+RUN corepack enable && pnpm install --frozen-lockfile
+COPY . .
+RUN pnpm build
+EXPOSE 3000
+CMD ["node", "dist/index.js"]
+`;
+}
+function generateDockerignore() {
+  return `node_modules
+dist
+*.log
+.env
+.git
+`;
+}
+function generateDockerCompose(dialect) {
+  if (dialect === "sqlite") {
+    return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    volumes:
+      - ./data:/app/data
+    environment:
+      - DATABASE_PATH=/app/data/app.db
+`;
+  }
+  if (dialect === "mysql") {
+    return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=mysql://fossyl:fossyl@db:3306/fossyl
+  db:
+    image: mysql:8
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_USER: fossyl
+      MYSQL_PASSWORD: fossyl
+      MYSQL_DATABASE: fossyl
+    volumes:
+      - mysqldata:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  mysqldata:
+`;
+  }
+  return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=postgres://fossyl:fossyl@db:5432/fossyl
+  db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: fossyl
+      POSTGRES_PASSWORD: fossyl
+      POSTGRES_DB: fossyl
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U fossyl"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  pgdata:
+`;
+}
+
 // src/scaffold.ts
 function generateFiles(options) {
   const files = [];
@@ -910,7 +1119,7 @@ function generateFiles(options) {
   if (options.database === "kysely") {
     files.push({
       path: "src/db.ts",
-      content: generateKyselySetup()
+      content: generateKyselySetup(options.dialect)
     });
     files.push({
       path: "src/types/db.ts",
@@ -922,7 +1131,7 @@ function generateFiles(options) {
     });
     files.push({
       path: "src/migrations/001_create_ping.ts",
-      content: generatePingMigration()
+      content: generatePingMigration(options.dialect)
     });
   } else {
     files.push({
@@ -957,6 +1166,20 @@ function generateFiles(options) {
     path: "src/features/ping/repo/ping.repo.ts",
     content: generatePingRepo(options)
   });
+  if (options.docker) {
+    files.push({
+      path: "Dockerfile",
+      content: generateDockerfile()
+    });
+    files.push({
+      path: ".dockerignore",
+      content: generateDockerignore()
+    });
+    files.push({
+      path: "docker-compose.yml",
+      content: generateDockerCompose(options.dialect)
+    });
+  }
   return files;
 }
 function writeFiles(projectPath, files) {

package/dist/index.mjs

@@ -52,7 +52,30 @@ async function promptForOptions(projectName) {
     p.cancel("Operation cancelled.");
     return null;
   }
-  return { name, server, validator, database };
+  let dialect;
+  if (database === "kysely") {
+    dialect = await p.select({
+      message: "Database dialect:",
+      options: [
+        { value: "sqlite", label: "SQLite", hint: "recommended - great for per-customer databases" },
+        { value: "postgres", label: "PostgreSQL" },
+        { value: "mysql", label: "MySQL" }
+      ]
+    });
+    if (p.isCancel(dialect)) {
+      p.cancel("Operation cancelled.");
+      return null;
+    }
+  }
+  const docker = await p.confirm({
+    message: "Include Docker setup?",
+    initialValue: true
+  });
+  if (p.isCancel(docker)) {
+    p.cancel("Operation cancelled.");
+    return null;
+  }
+  return { name, server, validator, database, dialect, docker };
 }
 
 // src/scaffold.ts
@@ -81,8 +104,15 @@ function generatePackageJson(options) {
   if (options.database === "kysely") {
     dependencies["@fossyl/kysely"] = "^0.9.0";
     dependencies["kysely"] = "^0.27.0";
-    dependencies["pg"] = "^8.13.0";
-    devDependencies["@types/pg"] = "^8.11.0";
+    if (options.dialect === "sqlite") {
+      dependencies["better-sqlite3"] = "^11.0.0";
+      devDependencies["@types/better-sqlite3"] = "^7.6.0";
+    } else if (options.dialect === "mysql") {
+      dependencies["mysql2"] = "^3.11.0";
+    } else {
+      dependencies["pg"] = "^8.13.0";
+      devDependencies["@types/pg"] = "^8.11.0";
+    }
   }
   const pkg = {
     name: options.name === "." ? "my-fossyl-api" : options.name,
@@ -123,8 +153,17 @@ PORT=3000
   if (options.database === "kysely") {
     content += `
 # Database
-DATABASE_URL=postgres://user:password@localhost:5432/mydb
 `;
+    if (options.dialect === "sqlite") {
+      content += `DATABASE_PATH=./data/app.db
+`;
+    } else if (options.dialect === "mysql") {
+      content += `DATABASE_URL=mysql://user:password@localhost:3306/mydb
+`;
+    } else {
+      content += `DATABASE_URL=postgres://user:password@localhost:5432/mydb
+`;
+    }
   }
   return content;
 }
@@ -370,7 +409,39 @@ export function startServer(routes: Route[], port: number): void {
 }
 
 // src/templates/database/kysely.ts
-function generateKyselySetup() {
+function generateKyselySetup(dialect = "postgres") {
+  if (dialect === "sqlite") {
+    return `import Database from 'better-sqlite3';
+import { Kysely, SqliteDialect } from 'kysely';
+import type { DB } from './types/db';
+
+const databasePath = process.env.DATABASE_PATH || './data/app.db';
+
+export const db = new Kysely<DB>({
+  dialect: new SqliteDialect({
+    database: new Database(databasePath),
+  }),
+});
+`;
+  }
+  if (dialect === "mysql") {
+    return `import { createPool } from 'mysql2';
+import { Kysely, MysqlDialect } from 'kysely';
+import type { DB } from './types/db';
+
+const connectionString = process.env.DATABASE_URL;
+
+if (!connectionString) {
+  throw new Error('DATABASE_URL environment variable is required');
+}
+
+export const db = new Kysely<DB>({
+  dialect: new MysqlDialect({
+    pool: createPool(connectionString),
+  }),
+});
+`;
+  }
   return `import { Kysely, PostgresDialect } from 'kysely';
 import { Pool } from 'pg';
 import type { DB } from './types/db';
@@ -418,7 +489,53 @@ export const migrations = createMigrationProvider({
 });
 `;
 }
-function generatePingMigration() {
+function generatePingMigration(dialect = "postgres") {
+  if (dialect === "sqlite") {
+    return `import { sql } from 'kysely';
+import { defineMigration } from '@fossyl/kysely';
+
+export const migration = defineMigration({
+  async up(db) {
+    await db.schema
+      .createTable('ping')
+      .addColumn('id', 'text', (col) => col.primaryKey())
+      .addColumn('message', 'text', (col) => col.notNull())
+      .addColumn('created_by', 'text', (col) => col.notNull())
+      .addColumn('created_at', 'text', (col) =>
+        col.notNull().defaultTo(sql\`(datetime('now'))\`)
+      )
+      .execute();
+  },
+
+  async down(db) {
+    await db.schema.dropTable('ping').execute();
+  },
+});
+`;
+  }
+  if (dialect === "mysql") {
+    return `import { sql } from 'kysely';
+import { defineMigration } from '@fossyl/kysely';
+
+export const migration = defineMigration({
+  async up(db) {
+    await db.schema
+      .createTable('ping')
+      .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+      .addColumn('message', 'varchar(255)', (col) => col.notNull())
+      .addColumn('created_by', 'varchar(255)', (col) => col.notNull())
+      .addColumn('created_at', 'timestamp', (col) =>
+        col.notNull().defaultTo(sql\`CURRENT_TIMESTAMP\`)
+      )
+      .execute();
+  },
+
+  async down(db) {
+    await db.schema.dropTable('ping').execute();
+  },
+});
+`;
+  }
   return `import { sql } from 'kysely';
 import { defineMigration } from '@fossyl/kysely';
 
@@ -849,6 +966,98 @@ export async function remove(id: string): Promise<void> {
 `;
 }
 
+// src/templates/docker.ts
+function generateDockerfile() {
+  return `FROM node:20-alpine
+WORKDIR /app
+COPY package*.json pnpm-lock.yaml* ./
+RUN corepack enable && pnpm install --frozen-lockfile
+COPY . .
+RUN pnpm build
+EXPOSE 3000
+CMD ["node", "dist/index.js"]
+`;
+}
+function generateDockerignore() {
+  return `node_modules
+dist
+*.log
+.env
+.git
+`;
+}
+function generateDockerCompose(dialect) {
+  if (dialect === "sqlite") {
+    return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    volumes:
+      - ./data:/app/data
+    environment:
+      - DATABASE_PATH=/app/data/app.db
+`;
+  }
+  if (dialect === "mysql") {
+    return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=mysql://fossyl:fossyl@db:3306/fossyl
+  db:
+    image: mysql:8
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_USER: fossyl
+      MYSQL_PASSWORD: fossyl
+      MYSQL_DATABASE: fossyl
+    volumes:
+      - mysqldata:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  mysqldata:
+`;
+  }
+  return `services:
+  app:
+    build: .
+    ports:
+      - "\${PORT:-3000}:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=postgres://fossyl:fossyl@db:5432/fossyl
+  db:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: fossyl
+      POSTGRES_PASSWORD: fossyl
+      POSTGRES_DB: fossyl
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U fossyl"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  pgdata:
+`;
+}
+
 // src/scaffold.ts
 function generateFiles(options) {
   const files = [];
@@ -886,7 +1095,7 @@ function generateFiles(options) {
   if (options.database === "kysely") {
     files.push({
       path: "src/db.ts",
-      content: generateKyselySetup()
+      content: generateKyselySetup(options.dialect)
     });
     files.push({
       path: "src/types/db.ts",
@@ -898,7 +1107,7 @@ function generateFiles(options) {
     });
     files.push({
       path: "src/migrations/001_create_ping.ts",
-      content: generatePingMigration()
+      content: generatePingMigration(options.dialect)
     });
   } else {
     files.push({
@@ -933,6 +1142,20 @@ function generateFiles(options) {
     path: "src/features/ping/repo/ping.repo.ts",
     content: generatePingRepo(options)
   });
+  if (options.docker) {
+    files.push({
+      path: "Dockerfile",
+      content: generateDockerfile()
+    });
+    files.push({
+      path: ".dockerignore",
+      content: generateDockerignore()
+    });
+    files.push({
+      path: "docker-compose.yml",
+      content: generateDockerCompose(options.dialect)
+    });
+  }
   return files;
 }
 function writeFiles(projectPath, files) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fossyl",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "CLI for scaffolding fossyl projects",
   "bin": {
     "fossyl": "./bin/fossyl.js"