alepha 0.14.0 → 0.14.2

package/src/cli/commands/{ViteCommands.ts → build.ts}

@@ -1,7 +1,7 @@
 import { access, readFile, unlink, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { join } from "node:path";
-import { $env, $inject, OPTIONS, t } from "alepha";
+import { $inject, OPTIONS, t } from "alepha";
 import { $command } from "alepha/command";
 import { $logger } from "alepha/logger";
 import {
@@ -18,78 +18,10 @@ import {
 import type * as Vite from "vite";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
 
-export class ViteCommands {
+export class BuildCommand {
   protected readonly log = $logger();
   protected readonly utils = $inject(AlephaCliUtils);
 
-  protected readonly env = $env(
-    t.object({
-      VITEST_ARGS: t.string({ default: "" }),
-    }),
-  );
-
-  public readonly run = $command({
-    name: "run",
-    hide: true,
-    description: "Run a TypeScript file directly",
-    flags: t.object({
-      watch: t.optional(
-        t.boolean({ description: "Watch file for changes", alias: "w" }),
-      ),
-    }),
-    summary: false,
-    args: t.text({ title: "path", description: "Filepath to run" }),
-    handler: async ({ args, flags, root }) => {
-      await this.utils.ensureTsConfig(root);
-      await this.utils.exec(`tsx ${flags.watch ? "watch " : ""}${args}`);
-    },
-  });
-
-  /**
-   * Will run the project in watch mode.
-   *
-   * - If an index.html file is found in the project root, it will run Vite in dev mode.
-   * - Otherwise, it will look for a server entry file and run it with tsx in watch mode.
-   */
-  public readonly dev = $command({
-    name: "dev",
-    description: "Run the project in development mode",
-    args: t.optional(t.text({ title: "path", description: "Filepath to run" })),
-    handler: async ({ args, root }) => {
-      const expo = await this.utils.hasExpo(root);
-
-      await this.utils.ensureConfig(root, {
-        viteConfigTs: !expo,
-        tsconfigJson: true,
-      });
-
-      if (expo) {
-        await this.utils.exec(`expo start`);
-        return;
-      }
-
-      const entry = await boot.getServerEntry(root, args);
-      this.log.trace("Entry file found", { entry });
-
-      try {
-        await access(join(root, "index.html"));
-      } catch {
-        this.log.trace("No index.html found, running entry file with tsx");
-        let cmd = "tsx --watch";
-        if (await this.utils.exists(root, ".env")) {
-          cmd += ` --env-file=./.env`;
-        }
-        cmd += ` ${entry}`;
-        await this.utils.exec(cmd);
-        return;
-      }
-
-      // Ensure vite is installed before running
-      await this.utils.ensureDependency(root, "vite");
-      await this.utils.exec(`vite`);
-    },
-  });
-
   public readonly build = $command({
     name: "build",
     description: "Build the project for production",
@@ -122,11 +54,6 @@ export class ViteCommands {
           description: "Generate sitemap.xml with base URL",
         }),
       ),
-      prerender: t.optional(
-        t.boolean({
-          description: "Pre-render static pages",
-        }),
-      ),
     }),
     handler: async ({ flags, args, run, root }) => {
       // Tell viteAlephaBuild plugin to skip - CLI handles all tasks
@@ -165,7 +92,7 @@ export class ViteCommands {
       );
       const viteAlephaBuildOptions = alephaPlugin?.[OPTIONS] || {};
 
-      await this.utils.loadEnvFile(root, [".env", ".env.production"]);
+      await this.utils.loadEnv(root, [".env", ".env.production"]);
 
       const stats = flags.stats ?? viteAlephaBuildOptions.stats ?? false;
       const hasServer = viteAlephaBuildOptions.serverEntry !== false;
@@ -254,7 +181,7 @@ export class ViteCommands {
         }
 
         // Pre-render static pages
-        const shouldPrerender = flags.prerender ?? clientOptions.prerender;
+        const shouldPrerender = clientOptions.prerender;
 
         if (shouldPrerender) {
           await run({
@@ -318,20 +245,4 @@ export class ViteCommands {
       }
     },
   });
-
-  public readonly test = $command({
-    name: "test",
-    description: "Run tests using Vitest",
-    handler: async ({ root }) => {
-      await this.utils.ensureConfig(root, {
-        tsconfigJson: true,
-        viteConfigTs: true,
-      });
-
-      // Ensure vitest is installed before running
-      await this.utils.ensureDependency(root, "vitest");
-
-      await this.utils.exec(`vitest run ${this.env.VITEST_ARGS}`);
-    },
-  });
 }

package/src/cli/commands/changelog.ts

@@ -0,0 +1,244 @@
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
+import { $inject, $use, t } from "alepha";
+import { $command } from "alepha/command";
+import { $logger } from "alepha/logger";
+import { changelogOptions } from "../atoms/changelogOptions.ts";
+import { GitMessageParser } from "../services/GitMessageParser.ts";
+
+export {
+  type ChangelogOptions,
+  changelogOptions,
+  DEFAULT_IGNORE,
+} from "../atoms/changelogOptions.ts";
+export { GitMessageParser } from "../services/GitMessageParser.ts";
+
+const execAsync = promisify(exec);
+
+// =============================================================================
+// GIT PROVIDER
+// =============================================================================
+
+/**
+ * Git provider for executing git commands.
+ * Can be substituted in tests with a mock implementation.
+ */
+export class GitProvider {
+  async exec(cmd: string, cwd: string): Promise<string> {
+    const { stdout } = await execAsync(`git ${cmd}`, { cwd });
+    return stdout;
+  }
+}
+
+// =============================================================================
+// TYPES
+// =============================================================================
+
+export interface Commit {
+  hash: string;
+  type: string;
+  scope: string | null;
+  description: string;
+  breaking: boolean;
+}
+
+interface ChangelogEntry {
+  features: Commit[];
+  fixes: Commit[];
+}
+
+// =============================================================================
+// CHANGELOG COMMAND
+// =============================================================================
+
+/**
+ * Changelog command for generating release notes from git commits.
+ *
+ * Usage:
+ * - `alepha changelog` - Show unreleased changes since latest tag to HEAD
+ * - `alepha changelog --from=1.0.0` - Show changes from version to HEAD
+ * - `alepha changelog --from=1.0.0 --to=1.1.0` - Show changes between two refs
+ * - `alepha changelog | tee -a CHANGELOG.md` - Append to file
+ */
+export class ChangelogCommand {
+  protected readonly log = $logger();
+  protected readonly git = $inject(GitProvider);
+  protected readonly parser = $inject(GitMessageParser);
+  protected readonly config = $use(changelogOptions);
+
+  // ---------------------------------------------------------------------------
+  // FORMATTING
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Format a single commit line.
+   * Example: `- **cli**: add new command (\`abc1234\`)`
+   * Breaking changes are flagged: `- **cli**: add new command [BREAKING] (\`abc1234\`)`
+   */
+  protected formatCommit(commit: Commit): string {
+    const breaking = commit.breaking ? " [BREAKING]" : "";
+    return `- **${commit.scope}**: ${commit.description}${breaking} (\`${commit.hash}\`)`;
+  }
+
+  /**
+   * Format the changelog entry with sections.
+   */
+  protected formatEntry(entry: ChangelogEntry): string {
+    const sections: string[] = [];
+
+    if (entry.features.length > 0) {
+      sections.push("### Features\n");
+      for (const commit of entry.features) {
+        sections.push(this.formatCommit(commit));
+      }
+      sections.push("");
+    }
+
+    if (entry.fixes.length > 0) {
+      sections.push("### Bug Fixes\n");
+      for (const commit of entry.fixes) {
+        sections.push(this.formatCommit(commit));
+      }
+      sections.push("");
+    }
+
+    return sections.join("\n");
+  }
+
+  // ---------------------------------------------------------------------------
+  // PARSING
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Parse git log output into a changelog entry.
+   */
+  protected parseCommits(commitsOutput: string): ChangelogEntry {
+    const entry: ChangelogEntry = {
+      features: [],
+      fixes: [],
+    };
+
+    for (const line of commitsOutput.trim().split("\n")) {
+      if (!line.trim()) continue;
+
+      const commit = this.parser.parseCommit(line, this.config);
+      if (!commit) {
+        this.log.trace("Skipping commit", { line });
+        continue;
+      }
+
+      this.log.trace("Parsed commit", { commit });
+
+      // Categorize commit (breaking flag is preserved on the commit itself)
+      if (commit.type === "feat") {
+        entry.features.push(commit);
+      } else if (commit.type === "fix") {
+        entry.fixes.push(commit);
+      }
+    }
+
+    return entry;
+  }
+
+  /**
+   * Check if entry has any public commits.
+   */
+  protected hasChanges(entry: ChangelogEntry): boolean {
+    return entry.features.length > 0 || entry.fixes.length > 0;
+  }
+
+  /**
+   * Get the latest version tag.
+   */
+  protected async getLatestTag(
+    git: (cmd: string) => Promise<string>,
+  ): Promise<string | null> {
+    const tagsOutput = await git("tag --sort=-version:refname");
+    const tags = tagsOutput
+      .trim()
+      .split("\n")
+      .filter((tag) => tag.match(/^\d+\.\d+\.\d+$/));
+
+    return tags[0] || null;
+  }
+
+  // ---------------------------------------------------------------------------
+  // COMMAND
+  // ---------------------------------------------------------------------------
+
+  public readonly changelog = $command({
+    name: "changelog",
+    description:
+      "Generate changelog from conventional commits (outputs to stdout)",
+    flags: t.object({
+      /**
+       * Show changes from this ref (tag, commit, branch).
+       * Defaults to the latest version tag.
+       * Example: --from=1.0.0
+       */
+      from: t.optional(
+        t.string({
+          aliases: ["f"],
+          description: "Starting ref (default: latest tag)",
+        }),
+      ),
+      /**
+       * Show changes up to this ref (tag, commit, branch).
+       * Defaults to HEAD.
+       * Example: --to=main
+       */
+      to: t.optional(
+        t.string({
+          aliases: ["t"],
+          description: "Ending ref (default: HEAD)",
+        }),
+      ),
+    }),
+    handler: async ({ flags, root }) => {
+      const git = (cmd: string) => this.git.exec(cmd, root);
+
+      // Determine the starting point
+      let fromRef: string;
+
+      if (flags.from) {
+        // User specified a ref
+        fromRef = flags.from;
+        this.log.debug("Using specified from ref", { from: fromRef });
+      } else {
+        // Use latest tag
+        const latestTag = await this.getLatestTag(git);
+        if (!latestTag) {
+          process.stdout.write("No version tags found in repository\n");
+          return;
+        }
+        fromRef = latestTag;
+        this.log.debug("Using latest tag", { from: fromRef });
+      }
+
+      // Determine the ending point
+      const toRef = flags.to || "HEAD";
+      this.log.debug("Using to ref", { to: toRef });
+
+      // Get commits in range
+      const commitsOutput = await git(`log ${fromRef}..${toRef} --oneline`);
+
+      if (!commitsOutput.trim()) {
+        process.stdout.write(`No changes in range ${fromRef}..${toRef}\n`);
+        return;
+      }
+
+      // Parse and format
+      const entry = this.parseCommits(commitsOutput);
+
+      if (!this.hasChanges(entry)) {
+        process.stdout.write(
+          `No public changes in range ${fromRef}..${toRef}\n`,
+        );
+        return;
+      }
+
+      // Output the formatted changelog (no header - caller adds it if needed)
+      process.stdout.write(this.formatEntry(entry));
+    },
+  });
+}

package/src/cli/commands/clean.ts

@@ -0,0 +1,14 @@
+import { $command } from "alepha/command";
+
+export class CleanCommand {
+  /**
+   * Clean the project, removing the "dist" directory
+   */
+  public readonly clean = $command({
+    name: "clean",
+    description: "Clean the project",
+    handler: async ({ run }) => {
+      await run.rm("./dist");
+    },
+  });
+}

package/src/cli/commands/{DrizzleCommands.ts → db.ts}

@@ -3,7 +3,11 @@ import { join } from "node:path";
 import { $inject, AlephaError, t } from "alepha";
 import { $command } from "alepha/command";
 import { $logger } from "alepha/logger";
-import type { DrizzleKitProvider, RepositoryProvider } from "alepha/orm";
+import type {
+  DatabaseProvider,
+  DrizzleKitProvider,
+  RepositoryProvider,
+} from "alepha/orm";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
 
 const drizzleCommandFlags = t.object({
@@ -21,15 +25,15 @@ const drizzleCommandFlags = t.object({
   ),
 });
 
-export class DrizzleCommands {
-  log = $logger();
-  utils = $inject(AlephaCliUtils);
+export class DbCommand {
+  protected readonly log = $logger();
+  protected readonly utils = $inject(AlephaCliUtils);
 
   /**
    * Check if database migrations are up to date.
    */
-  check = $command({
-    name: "db:check-migrations",
+  protected readonly check = $command({
+    name: "check-migrations",
     description: "Check if database migration files are up to date",
     args: t.optional(
       t.text({
@@ -70,7 +74,7 @@ export class DrizzleCommands {
         ).catch(() => null);
 
         if (!journalFile) {
-          this.log.info(`No migration journal found.`);
+          this.log.info("No migration journal found.");
           return;
         }
 
@@ -126,15 +130,9 @@ export class DrizzleCommands {
 
   /**
    * Generate database migration files
-   *
-   * - Loads the Alepha instance from the specified entry file.
-   * - Retrieves all repository primitives to gather database models.
-   * - Creates temporary entity definitions based on the current database schema.
-   * - Writes these definitions to a temporary schema file. (node_modules/.db/entities.ts)
-   * - Invokes Drizzle Kit's CLI to generate migration files based on the current schema.
    */
-  generate = $command({
-    name: "db:generate",
+  protected readonly generate = $command({
+    name: "generate",
     description: "Generate migration files based on current database schema",
     summary: false,
     args: t.optional(
@@ -171,14 +169,9 @@ export class DrizzleCommands {
 
   /**
    * Push database schema changes directly to the database
-   *
-   * - Loads the Alepha instance from the specified entry file.
-   * - Retrieves all repository primitives to gather database models.
-   * - Creates temporary entity definitions and Drizzle config.
-   * - Invokes Drizzle Kit's push command to apply schema changes directly.
    */
-  push = $command({
-    name: "db:push",
+  protected readonly push = $command({
+    name: "push",
     description: "Push database schema changes directly to the database",
     summary: false,
     args: t.optional(
@@ -203,14 +196,9 @@ export class DrizzleCommands {
 
   /**
    * Apply pending database migrations
-   *
-   * - Loads the Alepha instance from the specified entry file.
-   * - Retrieves all repository primitives to gather database models.
-   * - Creates temporary entity definitions and Drizzle config.
-   * - Invokes Drizzle Kit's migrate command to apply pending migrations.
    */
-  migrate = $command({
-    name: "db:migrate",
+  protected readonly migrate = $command({
+    name: "migrate",
     description: "Apply pending database migrations",
     summary: false,
     args: t.optional(
@@ -235,14 +223,9 @@ export class DrizzleCommands {
 
   /**
    * Launch Drizzle Studio database browser
-   *
-   * - Loads the Alepha instance from the specified entry file.
-   * - Retrieves all repository primitives to gather database models.
-   * - Creates temporary entity definitions and Drizzle config.
-   * - Invokes Drizzle Kit's studio command to launch the web-based database browser.
    */
-  studio = $command({
-    name: "db:studio",
+  protected readonly studio = $command({
+    name: "studio",
     description: "Launch Drizzle Studio database browser",
     summary: false,
     args: t.optional(
@@ -265,13 +248,20 @@ export class DrizzleCommands {
     },
   });
 
+  /**
+   * Parent command for database operations.
+   */
+  public readonly db = $command({
+    name: "db",
+    description: "Database management commands",
+    children: [this.check, this.generate, this.push, this.migrate, this.studio],
+    handler: async ({ help }) => {
+      help();
+    },
+  });
+
   /**
    * Run a drizzle-kit command for all database providers in an Alepha instance.
-   *
-   * Iterates through all repository providers, prepares Drizzle config for each,
-   * and executes the specified drizzle-kit command.
-   *
-   * @param options - Configuration including command to run, flags, and logging
    */
   public async runDrizzleKitCommand(options: {
     root: string;
@@ -289,7 +279,7 @@ export class DrizzleCommands {
       envFiles.push(`.env.${options.env}`);
     }
 
-    await this.utils.loadEnvFile(rootDir, envFiles);
+    await this.utils.loadEnv(rootDir, envFiles);
 
     this.log.debug(`Using project root: ${rootDir}`);
 
@@ -349,16 +339,10 @@ export class DrizzleCommands {
 
   /**
    * Prepare Drizzle configuration files for a database provider.
-   *
-   * Creates temporary entities.js and drizzle.config.js files needed
-   * for Drizzle Kit commands to run properly.
-   *
-   * @param options - Configuration options including kit, provider info, and paths
-   * @returns Path to the generated drizzle.config.js file
    */
   public async prepareDrizzleConfig(options: {
     kit: any;
-    provider: any;
+    provider: DatabaseProvider;
     providerName: string;
     providerUrl: string;
     dialect: string;
@@ -387,6 +371,10 @@ export class DrizzleCommands {
       },
     };
 
+    if (options.provider.schema) {
+      config.schemaFilter = options.provider.schema;
+    }
+
     if (options.providerName === "d1") {
       config.driver = "d1-http";
     }
@@ -453,79 +441,4 @@ export class DrizzleCommands {
       options.rootDir,
     );
   }
-
-  // /**
-  //  * Drop database schema (development only)
-  //  *
-  //  * @experimental
-  //  */
-  // drop = $command({
-  //   name: "db:drop",
-  //   description: "Drop database schema (development only)",
-  //   summary: false,
-  //   args: t.optional(
-  //     t.text({
-  //       title: "path",
-  //       description: "Path to the Alepha server entry file",
-  //     }),
-  //   ),
-  //   flags: drizzleCommandFlags,
-  //   handler: async ({ flags }) => {
-  //     // TODO: Implement db:drop
-  //     this.log.warn("db:drop is not yet implemented");
-  //     if (flags.provider) {
-  //       this.log.info(`Provider filter: ${flags.provider}`);
-  //     }
-  //   },
-  // });
-  //
-  // /**
-  //  * Seed database with initial data
-  //  *
-  //  * @experimental
-  //  */
-  // seed = $command({
-  //   name: "db:seed",
-  //   description: "Seed database with initial data",
-  //   summary: false,
-  //   args: t.optional(
-  //     t.text({
-  //       title: "path",
-  //       description: "Path to the Alepha server entry file",
-  //     }),
-  //   ),
-  //   flags: drizzleCommandFlags,
-  //   handler: async ({ flags }) => {
-  //     // TODO: Implement db:seed
-  //     this.log.warn("db:seed is not yet implemented");
-  //     if (flags.provider) {
-  //       this.log.info(`Provider filter: ${flags.provider}`);
-  //     }
-  //   },
-  // });
-  //
-  // /**
-  //  * Show pending database migrations status
-  //  *
-  //  * @experimental
-  //  */
-  // status = $command({
-  //   name: "db:status",
-  //   description: "Show pending database migrations status",
-  //   summary: false,
-  //   args: t.optional(
-  //     t.text({
-  //       title: "path",
-  //       description: "Path to the Alepha server entry file",
-  //     }),
-  //   ),
-  //   flags: drizzleCommandFlags,
-  //   handler: async ({ flags }) => {
-  //     // TODO: Implement db:status
-  //     this.log.warn("db:status is not yet implemented");
-  //     if (flags.provider) {
-  //       this.log.info(`Provider filter: ${flags.provider}`);
-  //     }
-  //   },
-  // });
 }