deploy-bbc 1.1.0 → 1.2.1

package/cli/src/helpers/log-next-steps.ts

@@ -14,22 +14,31 @@ export function log_next_steps(
   options: InstallerOptions,
   _cliResults: CliResults
 ): void {
-  const { appName, packages } = options;
+  const { appName, packages, projectDir } = options;
+
+  // Check if project was created in current directory
+  const isCurrentDirectory = projectDir === process.cwd();
 
   console.log("\n" + chalk.bold.green("✨ Project created successfully!"));
   console.log("\n" + chalk.bold("Next steps:"));
   console.log();
 
-  // Step 1: Navigate to project
-  console.log(chalk.cyan("1.") + " Navigate to your project:");
-  console.log(`   ${chalk.gray("cd")} ${appName}`);
-  console.log();
+  let stepNumber = 1;
+
+  // Step 1: Navigate to project (skip if current directory)
+  if (!isCurrentDirectory) {
+    console.log(chalk.cyan(`${stepNumber}.`) + " Navigate to your project:");
+    console.log(`   ${chalk.gray("cd")} ${appName}`);
+    console.log();
+    stepNumber++;
+  }
 
-  // Step 2: Environment variables
-  console.log(chalk.cyan("2.") + " Set up environment variables:");
+  // Step: Environment variables
+  console.log(chalk.cyan(`${stepNumber}.`) + " Set up environment variables:");
   console.log(`   ${chalk.gray("cp")} .env.example .env`);
   console.log(`   ${chalk.gray("# Edit .env with your configuration")}`);
   console.log();
+  stepNumber++;
 
   // Step 3: Docker (if database or redis selected)
   const hasDocker =
@@ -39,9 +48,10 @@ export function log_next_steps(
     packages.includes(AvailablePackages.redis);
 
   if (hasDocker) {
-    console.log(chalk.cyan("3.") + " Start Docker services:");
+    console.log(chalk.cyan(`${stepNumber}.`) + " Start Docker services:");
     console.log(`   ${chalk.gray("docker-compose up -d")}`);
     console.log();
+    stepNumber++;
   }
 
   // Step 4: Database migrations (if postgres or mysql)
@@ -50,21 +60,14 @@ export function log_next_steps(
     packages.includes(AvailablePackages.mysql);
 
   if (needsMigration) {
-    const stepNum = hasDocker ? "4" : "3";
-    console.log(chalk.cyan(`${stepNum}.`) + " Run database migrations:");
+    console.log(chalk.cyan(`${stepNumber}.`) + " Run database migrations:");
     console.log(`   ${chalk.gray("bun run db:migrate")}`);
     console.log();
+    stepNumber++;
   }
 
-  // Step 5: Start development server
-  const lastStepNum = needsMigration
-    ? hasDocker
-      ? "5"
-      : "4"
-    : hasDocker
-    ? "4"
-    : "3";
-  console.log(chalk.cyan(`${lastStepNum}.`) + " Start the development server:");
+  // Step: Start development server
+  console.log(chalk.cyan(`${stepNumber}.`) + " Start the development server:");
   console.log(`   ${chalk.gray("bun run dev")}`);
   console.log();
 
@@ -74,7 +77,7 @@ export function log_next_steps(
     packages.includes(AvailablePackages.scalar)
   ) {
     console.log(
-      chalk.bold("📚 API Documentation:") + " http://localhost:3000/docs"
+      chalk.bold("📚 API Documentation:") + " http://localhost:8000/docs"
     );
     console.log();
   }

package/cli/src/helpers/scaffold-project.ts

@@ -9,10 +9,14 @@ const __dirname = path.dirname(__filename);
 
 /**
  * Scaffolds the base project structure by copying template files.
- * Creates the project directory and copies all files from templates/base/
+ * Creates the project directory and copies all files from the selected template.
+ *
+ * Special handling:
+ * - If projectDir is current directory: allows scaffolding but checks for conflicts (src/, package.json)
+ * - If projectDir is a new directory: creates it and requires it to be empty
  *
  * @param options - Installer options containing projectDir and other config
- * @throws Error if project directory already exists and is not empty
+ * @throws Error if project directory already exists and is not empty, or if conflicts detected in current directory
  */
 export async function scaffold_project(
   options: InstallerOptions
@@ -21,8 +25,10 @@ export async function scaffold_project(
   const spinner = ora("Scaffolding project...").start();
 
   try {
-    // Check if directory exists and is not empty
-    if (await fs.pathExists(projectDir)) {
+    const isCurrentDirectory = projectDir === process.cwd();
+
+    // Check if directory exists and is not empty (skip for current directory)
+    if (!isCurrentDirectory && await fs.pathExists(projectDir)) {
       const files = await fs.readdir(projectDir);
       if (files.length > 0) {
         spinner.fail(`Directory ${projectDir} already exists and is not empty`);
@@ -32,6 +38,26 @@ export async function scaffold_project(
       }
     }
 
+    // If scaffolding in current directory, check for conflicts
+    if (isCurrentDirectory) {
+      const conflictingPaths = ["src", "package.json"];
+      const conflicts = [];
+
+      for (const pathToCheck of conflictingPaths) {
+        if (await fs.pathExists(path.join(projectDir, pathToCheck))) {
+          conflicts.push(pathToCheck);
+        }
+      }
+
+      if (conflicts.length > 0) {
+        spinner.fail("Cannot scaffold in current directory");
+        throw new Error(
+          `The following files/folders already exist: ${conflicts.join(", ")}\n` +
+          "Please use an empty directory or choose a different location."
+        );
+      }
+    }
+
     // Ensure project directory exists
     await fs.ensureDir(projectDir);
 

package/cli/src/installers/auth.ts

@@ -76,7 +76,7 @@ async function install_oauth(projectDir: string): Promise<void> {
 
   await append_env_example(
     projectDir,
-    "\n# OAuth Configuration\nOAUTH_CLIENT_ID=your-client-id\nOAUTH_CLIENT_SECRET=your-client-secret\nOAUTH_CALLBACK_URL=http://localhost:3000/auth/callback\n"
+    "\n# OAuth Configuration\nOAUTH_CLIENT_ID=your-client-id\nOAUTH_CLIENT_SECRET=your-client-secret\nOAUTH_CALLBACK_URL=http://localhost:8000/auth/callback\n"
   );
 }
 

package/cli/src/templates/base/.env.example

@@ -1,3 +1,3 @@
 # Server Configuration
-PORT=3000
+PORT=8000
 NODE_ENV=development

package/cli/src/templates/base/package.json

@@ -10,8 +10,9 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
+    "dotenv": "^16.3.1",
     "hono": "^4.0.0",
-    "dotenv": "^16.3.1"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/cli/src/templates/base/src/config/index.ts

@@ -3,6 +3,6 @@ import { load_env } from "../utils/env.js";
 load_env();
 
 export const config = {
-  port: parseInt(process.env.PORT || "3000", 10),
+  port: parseInt(process.env.PORT || "8000", 10),
   nodeEnv: process.env.NODE_ENV || "development",
 } as const;

package/cli/src/templates/base/src/controllers/user/create-user.controller.ts

@@ -0,0 +1,84 @@
+import type { Context } from "hono";
+import { z } from "zod";
+import { user_model } from "../../models/user.model.js";
+import type { ApiResponse, ApiError } from "../../types/common/api-response.types.js";
+import type { UserResponse } from "../../types/models/user.types.js";
+
+/**
+ * Validation schema
+ */
+const create_user_schema = z.object({
+  email: z.string().email("Invalid email address"),
+  name: z.string().min(2, "Name must be at least 2 characters").max(100, "Name must not exceed 100 characters"),
+});
+
+/**
+ * Helper to format user response
+ */
+function format_user_response(user: any): UserResponse {
+  return {
+    id: user.id,
+    email: user.email,
+    name: user.name,
+    createdAt: user.createdAt.toISOString(),
+    updatedAt: user.updatedAt.toISOString(),
+  };
+}
+
+/**
+ * Create a new user
+ * POST /users
+ */
+export async function create_user(c: Context) {
+  try {
+    const body = await c.req.json();
+
+    // Validate request body
+    const validation = create_user_schema.safeParse(body);
+    if (!validation.success) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "Validation failed",
+          details: validation.error.errors.map((err) => ({
+            field: err.path.join("."),
+            message: err.message,
+          })),
+        },
+        400
+      );
+    }
+
+    // Check if email already exists
+    const existing_user = await user_model.find_by_email(validation.data.email);
+    if (existing_user) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "User with this email already exists",
+        },
+        409
+      );
+    }
+
+    // Create user
+    const user = await user_model.create(validation.data);
+
+    return c.json<ApiResponse<UserResponse>>(
+      {
+        success: true,
+        data: format_user_response(user),
+        message: "User created successfully",
+      },
+      201
+    );
+  } catch (error) {
+    return c.json<ApiError>(
+      {
+        success: false,
+        error: "Failed to create user",
+      },
+      500
+    );
+  }
+}

package/cli/src/templates/base/src/controllers/user/delete-user.controller.ts

@@ -0,0 +1,60 @@
+import type { Context } from "hono";
+import { z } from "zod";
+import { user_model } from "../../models/user.model.js";
+import type { ApiResponse, ApiError } from "../../types/common/api-response.types.js";
+
+/**
+ * Validation schema
+ */
+const user_id_schema = z.string().uuid("Invalid user ID format");
+
+/**
+ * Delete user by ID
+ * DELETE /users/:id
+ */
+export async function delete_user(c: Context) {
+  try {
+    const id = c.req.param("id");
+
+    // Validate ID format
+    const validation = user_id_schema.safeParse(id);
+    if (!validation.success) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "Invalid user ID",
+          details: validation.error.errors.map((err) => ({
+            field: err.path.join("."),
+            message: err.message,
+          })),
+        },
+        400
+      );
+    }
+
+    const deleted = await user_model.delete(id);
+
+    if (!deleted) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "User not found",
+        },
+        404
+      );
+    }
+
+    return c.json<ApiResponse>({
+      success: true,
+      message: "User deleted successfully",
+    });
+  } catch (error) {
+    return c.json<ApiError>(
+      {
+        success: false,
+        error: "Failed to delete user",
+      },
+      500
+    );
+  }
+}

package/cli/src/templates/base/src/controllers/user/get-user.controller.ts

@@ -0,0 +1,74 @@
+import type { Context } from "hono";
+import { z } from "zod";
+import { user_model } from "../../models/user.model.js";
+import type { ApiResponse, ApiError } from "../../types/common/api-response.types.js";
+import type { UserResponse } from "../../types/models/user.types.js";
+
+/**
+ * Validation schema
+ */
+const user_id_schema = z.string().uuid("Invalid user ID format");
+
+/**
+ * Helper to format user response
+ */
+function format_user_response(user: any): UserResponse {
+  return {
+    id: user.id,
+    email: user.email,
+    name: user.name,
+    createdAt: user.createdAt.toISOString(),
+    updatedAt: user.updatedAt.toISOString(),
+  };
+}
+
+/**
+ * Get user by ID
+ * GET /users/:id
+ */
+export async function get_user(c: Context) {
+  try {
+    const id = c.req.param("id");
+
+    // Validate ID format
+    const validation = user_id_schema.safeParse(id);
+    if (!validation.success) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "Invalid user ID",
+          details: validation.error.errors.map((err) => ({
+            field: err.path.join("."),
+            message: err.message,
+          })),
+        },
+        400
+      );
+    }
+
+    const user = await user_model.find_by_id(id);
+
+    if (!user) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "User not found",
+        },
+        404
+      );
+    }
+
+    return c.json<ApiResponse<UserResponse>>({
+      success: true,
+      data: format_user_response(user),
+    });
+  } catch (error) {
+    return c.json<ApiError>(
+      {
+        success: false,
+        error: "Failed to fetch user",
+      },
+      500
+    );
+  }
+}

package/cli/src/templates/base/src/controllers/user/get-users.controller.ts

@@ -0,0 +1,41 @@
+import type { Context } from "hono";
+import { user_model } from "../../models/user.model.js";
+import type { ApiResponse, ApiError } from "../../types/common/api-response.types.js";
+import type { UserResponse } from "../../types/models/user.types.js";
+
+/**
+ * Helper to format user response
+ */
+function format_user_response(user: any): UserResponse {
+  return {
+    id: user.id,
+    email: user.email,
+    name: user.name,
+    createdAt: user.createdAt.toISOString(),
+    updatedAt: user.updatedAt.toISOString(),
+  };
+}
+
+/**
+ * Get all users
+ * GET /users
+ */
+export async function get_users(c: Context) {
+  try {
+    const users = await user_model.find_all();
+    const formatted_users = users.map(format_user_response);
+
+    return c.json<ApiResponse<UserResponse[]>>({
+      success: true,
+      data: formatted_users,
+    });
+  } catch (error) {
+    return c.json<ApiError>(
+      {
+        success: false,
+        error: "Failed to fetch users",
+      },
+      500
+    );
+  }
+}

package/cli/src/templates/base/src/controllers/user/update-user.controller.ts

@@ -0,0 +1,111 @@
+import type { Context } from "hono";
+import { z } from "zod";
+import { user_model } from "../../models/user.model.js";
+import type { ApiResponse, ApiError } from "../../types/common/api-response.types.js";
+import type { UserResponse } from "../../types/models/user.types.js";
+
+/**
+ * Validation schemas
+ */
+const user_id_schema = z.string().uuid("Invalid user ID format");
+const update_user_schema = z.object({
+  email: z.string().email("Invalid email address").optional(),
+  name: z.string().min(2, "Name must be at least 2 characters").max(100, "Name must not exceed 100 characters").optional(),
+});
+
+/**
+ * Helper to format user response
+ */
+function format_user_response(user: any): UserResponse {
+  return {
+    id: user.id,
+    email: user.email,
+    name: user.name,
+    createdAt: user.createdAt.toISOString(),
+    updatedAt: user.updatedAt.toISOString(),
+  };
+}
+
+/**
+ * Update user by ID
+ * PATCH /users/:id
+ */
+export async function update_user(c: Context) {
+  try {
+    const id = c.req.param("id");
+    const body = await c.req.json();
+
+    // Validate ID format
+    const id_validation = user_id_schema.safeParse(id);
+    if (!id_validation.success) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "Invalid user ID",
+          details: id_validation.error.errors.map((err) => ({
+            field: err.path.join("."),
+            message: err.message,
+          })),
+        },
+        400
+      );
+    }
+
+    // Validate request body
+    const body_validation = update_user_schema.safeParse(body);
+    if (!body_validation.success) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "Validation failed",
+          details: body_validation.error.errors.map((err) => ({
+            field: err.path.join("."),
+            message: err.message,
+          })),
+        },
+        400
+      );
+    }
+
+    // Check if email is being updated and if it already exists
+    if (body_validation.data.email) {
+      const existing_user = await user_model.find_by_email(body_validation.data.email);
+      if (existing_user && existing_user.id !== id) {
+        return c.json<ApiError>(
+          {
+            success: false,
+            error: "User with this email already exists",
+          },
+          409
+        );
+      }
+    }
+
+    // Update user
+    const user = await user_model.update(id, body_validation.data);
+
+    if (!user) {
+      return c.json<ApiError>(
+        {
+          success: false,
+          error: "User not found",
+        },
+        404
+      );
+    }
+
+    return c.json<ApiResponse<UserResponse>>({
+      success: true,
+      data: format_user_response(user),
+      message: "User updated successfully",
+    });
+  } catch (error) {
+    return c.json<ApiError>(
+      {
+        success: false,
+        error: "Failed to update user",
+      },
+      500
+    );
+  }
+}

package/cli/src/templates/base/src/models/user.model.ts

@@ -0,0 +1,83 @@
+import type { User, CreateUserInput, UpdateUserInput } from "../types/models/user.types.js";
+
+/**
+ * User model
+ *
+ * This is a simple in-memory implementation.
+ * Replace with your database ORM (Drizzle, Prisma, etc.) in production.
+ */
+
+// In-memory storage (for demonstration)
+const users: User[] = [];
+
+export const user_model = {
+  /**
+   * Find all users
+   */
+  find_all: async (): Promise<User[]> => {
+    return users;
+  },
+
+  /**
+   * Find user by ID
+   */
+  find_by_id: async (id: string): Promise<User | undefined> => {
+    return users.find((user) => user.id === id);
+  },
+
+  /**
+   * Find user by email
+   */
+  find_by_email: async (email: string): Promise<User | undefined> => {
+    return users.find((user) => user.email === email);
+  },
+
+  /**
+   * Create a new user
+   */
+  create: async (input: CreateUserInput): Promise<User> => {
+    const user: User = {
+      id: crypto.randomUUID(),
+      email: input.email,
+      name: input.name,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    };
+
+    users.push(user);
+    return user;
+  },
+
+  /**
+   * Update user by ID
+   */
+  update: async (id: string, input: UpdateUserInput): Promise<User | undefined> => {
+    const index = users.findIndex((user) => user.id === id);
+
+    if (index === -1) {
+      return undefined;
+    }
+
+    users[index] = {
+      ...users[index],
+      ...input,
+      updatedAt: new Date(),
+    };
+
+    return users[index];
+  },
+
+  /**
+   * Delete user by ID
+   */
+  delete: async (id: string): Promise<boolean> => {
+    const index = users.findIndex((user) => user.id === id);
+
+    if (index === -1) {
+      return false;
+    }
+
+    users.splice(index, 1);
+    return true;
+  },
+};

package/cli/src/templates/base/src/routes/index.ts

@@ -1,7 +1,9 @@
 import { Hono } from "hono";
+import user_route from "./user.route.js";
 
 const routes = new Hono();
 
+// Root route
 routes.get("/", (c) => {
   return c.json({
     message: "Welcome to your Bun backend!",
@@ -9,4 +11,7 @@ routes.get("/", (c) => {
   });
 });
 
+// User routes
+routes.route("/users", user_route);
+
 export default routes;

package/cli/src/templates/base/src/routes/user.route.ts

@@ -0,0 +1,17 @@
+import { Hono } from "hono";
+import { get_users } from "../controllers/user/get-users.controller.js";
+import { get_user } from "../controllers/user/get-user.controller.js";
+import { create_user } from "../controllers/user/create-user.controller.js";
+import { update_user } from "../controllers/user/update-user.controller.js";
+import { delete_user } from "../controllers/user/delete-user.controller.js";
+
+const user_route = new Hono();
+
+// User CRUD routes
+user_route.get("/", get_users);
+user_route.get("/:id", get_user);
+user_route.post("/", create_user);
+user_route.patch("/:id", update_user);
+user_route.delete("/:id", delete_user);
+
+export default user_route;