alepha 0.14.4 → 0.15.1

package/src/cli/commands/init.ts

@@ -1,9 +1,15 @@
 import { $inject, t } from "alepha";
 import { $command } from "alepha/command";
+import { FileSystemProvider } from "alepha/file";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
+import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
+import { ProjectScaffolder } from "../services/ProjectScaffolder.ts";
 
 export class InitCommand {
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly pm = $inject(PackageManagerUtils);
+  protected readonly scaffolder = $inject(ProjectScaffolder);
+  protected readonly fs = $inject(FileSystemProvider);
 
   /**
    * Ensure the project has the necessary Alepha configuration files.
@@ -12,7 +18,20 @@ export class InitCommand {
   public readonly init = $command({
     name: "init",
     description: "Add missing Alepha configuration files to the project",
+    args: t.optional(
+      t.text({
+        title: "path",
+        trim: true,
+        lowercase: true,
+      }),
+    ),
     flags: t.object({
+      agent: t.optional(
+        t.boolean({
+          aliases: ["a"],
+          description: "Add CLAUDE.md for Claude Code AI assistant",
+        }),
+      ),
       // choose package manager
       yarn: t.optional(t.boolean({ description: "Use Yarn package manager" })),
       pnpm: t.optional(t.boolean({ description: "Use pnpm package manager" })),
@@ -20,7 +39,10 @@ export class InitCommand {
       bun: t.optional(t.boolean({ description: "Use Bun package manager" })),
       // choose which dependencies to add
       react: t.optional(
-        t.boolean({ description: "Include Alepha React dependencies" }),
+        t.boolean({
+          aliases: ["r"],
+          description: "Include Alepha React dependencies",
+        }),
       ),
       ui: t.optional(
         t.boolean({ description: "Include Alepha UI dependencies" }),
@@ -28,63 +50,95 @@ export class InitCommand {
       test: t.optional(
         t.boolean({ description: "Include Vitest and create test directory" }),
       ),
+      force: t.optional(
+        t.boolean({
+          aliases: ["f"],
+          description: "Override existing files",
+        }),
+      ),
     }),
-    handler: async ({ run, flags, root }) => {
-      if (flags.ui) {
-        flags.react = true;
+    handler: async ({ run, flags, root, args }) => {
+      if (flags.react) {
+        flags.ui = true;
       }
 
-      const isExpo = await this.utils.hasExpo(root);
+      if (args) {
+        root = this.fs.join(root, args);
+        await this.fs.mkdir(root);
+      }
+
+      const isExpo = await this.pm.hasExpo(root);
+
+      const force = !!flags.force;
 
       await run({
         name: "ensuring configuration files",
         handler: async () => {
-          await this.utils.ensureConfig(root, {
+          await this.scaffolder.ensureConfig(root, {
+            force,
             tsconfigJson: true,
             packageJson: flags,
             biomeJson: true,
             editorconfig: true,
             indexHtml: !!flags.react && !isExpo,
+            claudeMd: flags.agent
+              ? { react: !!flags.react, ui: !!flags.ui }
+              : false,
           });
 
-          // Create src/main.ts if src directory is empty or doesn't exist
+          // Create API project structure if not React
           if (!flags.react) {
-            await this.utils.ensureSrcMain(root);
+            await this.scaffolder.ensureApiProject(root, { force });
           }
         },
       });
 
       // TODO: check if all alepha dependencies are same version
 
-      const pm = await this.utils.getPackageManager(root, flags);
-      if (pm === "yarn") {
-        await this.utils.ensureYarn(root);
-        await run("yarn set version stable");
-      } else if (pm === "bun") {
-        await this.utils.ensureBun(root);
-      } else if (pm === "pnpm") {
-        await this.utils.ensurePnpm(root);
+      const pmName = await this.pm.getPackageManager(root, flags);
+      if (pmName === "yarn") {
+        await this.pm.ensureYarn(root);
+        await run("yarn set version stable", { root });
+      } else if (pmName === "bun") {
+        await this.pm.ensureBun(root);
+      } else if (pmName === "pnpm") {
+        await this.pm.ensurePnpm(root);
       } else {
-        await this.utils.ensureNpm(root);
+        await this.pm.ensureNpm(root);
       }
 
-      await run(`${pm} install`, {
-        alias: `installing dependencies with ${pm}`,
+      await run(`${pmName} install`, {
+        alias: `installing dependencies with ${pmName}`,
+        root,
       });
 
       if (!isExpo) {
-        await this.utils.ensureDependency(root, "vite", { run });
+        await this.pm.ensureDependency(root, "vite", {
+          run,
+          exec: (cmd, opts) => this.utils.exec(cmd, opts),
+        });
       }
 
-      await this.utils.ensureDependency(root, "@biomejs/biome", { run });
+      await this.pm.ensureDependency(root, "@biomejs/biome", {
+        run,
+        exec: (cmd, opts) => this.utils.exec(cmd, opts),
+      });
 
       // Install vitest and create test directory if --test flag is set
       if (flags.test) {
-        await this.utils.ensureTestDir(root);
-        await run(`${pm} ${pm === "yarn" ? "add" : "install"} -D vitest`, {
-          alias: "setup testing with Vitest",
-        });
+        await this.scaffolder.ensureTestDir(root);
+        await run(
+          `${pmName} ${pmName === "yarn" ? "add" : "install"} -D vitest`,
+          {
+            alias: "setup testing with Vitest",
+          },
+        );
       }
+
+      await run(`${pmName} run lint`, {
+        alias: "running linter",
+        root,
+      });
     },
   });
 }

package/src/cli/commands/lint.ts

@@ -1,17 +1,23 @@
 import { $inject } from "alepha";
 import { $command } from "alepha/command";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
+import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
+import { ProjectScaffolder } from "../services/ProjectScaffolder.ts";
 
 export class LintCommand {
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly pm = $inject(PackageManagerUtils);
+  protected readonly scaffolder = $inject(ProjectScaffolder);
 
   public readonly lint = $command({
     name: "lint",
     description: "Run linter across the codebase using Biome",
     handler: async ({ root }) => {
-      await this.utils.ensureConfig(root, { biomeJson: true });
-      await this.utils.ensureDependency(root, "@biomejs/biome");
-      await this.utils.exec("biome check --formatter-enabled=false --fix");
+      await this.scaffolder.ensureConfig(root, { biomeJson: true });
+      await this.pm.ensureDependency(root, "@biomejs/biome", {
+        exec: (cmd, opts) => this.utils.exec(cmd, opts),
+      });
+      await this.utils.exec("biome check --fix");
     },
   });
 }

package/src/cli/commands/test.ts

@@ -1,9 +1,13 @@
 import { $inject, t } from "alepha";
 import { $command } from "alepha/command";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
+import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
+import { ProjectScaffolder } from "../services/ProjectScaffolder.ts";
 
 export class TestCommand {
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly pm = $inject(PackageManagerUtils);
+  protected readonly scaffolder = $inject(ProjectScaffolder);
 
   public readonly test = $command({
     name: "test",
@@ -26,12 +30,14 @@ export class TestCommand {
       ),
     }),
     handler: async ({ root, flags, env }) => {
-      await this.utils.ensureConfig(root, {
+      await this.scaffolder.ensureConfig(root, {
         tsconfigJson: true,
       });
 
       // Ensure vitest is installed before running
-      await this.utils.ensureDependency(root, "vitest");
+      await this.pm.ensureDependency(root, "vitest", {
+        exec: (cmd, opts) => this.utils.exec(cmd, opts),
+      });
 
       const config = flags.config ? `--config=${flags.config}` : "";
 

package/src/cli/commands/typecheck.ts

@@ -2,9 +2,11 @@ import { $inject } from "alepha";
 import { $command } from "alepha/command";
 import { $logger } from "alepha/logger";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
+import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
 
 export class TypecheckCommand {
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly pm = $inject(PackageManagerUtils);
   protected readonly log = $logger();
 
   /**
@@ -16,7 +18,9 @@ export class TypecheckCommand {
     description: "Check TypeScript types across the codebase",
     handler: async ({ root }) => {
       this.log.info("Starting TypeScript type checking...");
-      await this.utils.ensureDependency(root, "typescript");
+      await this.pm.ensureDependency(root, "typescript", {
+        exec: (cmd, opts) => this.utils.exec(cmd, opts),
+      });
       await this.utils.exec("tsc --noEmit");
       this.log.info("TypeScript type checking completed successfully.");
     },

package/src/cli/commands/verify.ts

@@ -1,9 +1,11 @@
 import { $inject } from "alepha";
 import { $command } from "alepha/command";
 import { AlephaCliUtils } from "../services/AlephaCliUtils.ts";
+import { PackageManagerUtils } from "../services/PackageManagerUtils.ts";
 
 export class VerifyCommand {
   protected readonly utils = $inject(AlephaCliUtils);
+  protected readonly pm = $inject(PackageManagerUtils);
 
   /**
    * Run a series of verification commands to ensure code quality and correctness.
@@ -28,7 +30,7 @@ export class VerifyCommand {
 
       await run("alepha typecheck");
 
-      const pkg = await this.utils.readPackageJson(root);
+      const pkg = await this.pm.readPackageJson(root);
       if (pkg.devDependencies?.vitest) {
         await run("alepha test");
       }
@@ -37,7 +39,7 @@ export class VerifyCommand {
         await run("alepha db check-migrations");
       }
 
-      const isExpo = await this.utils.hasExpo(root);
+      const isExpo = await this.pm.hasExpo(root);
       if (!isExpo) {
         await run("alepha build");
       }

package/src/cli/defineConfig.ts

@@ -1,8 +1,13 @@
 import type { Alepha } from "alepha";
 import type { CommandPrimitive } from "alepha/command";
+import {
+  type AppEntryOptions,
+  appEntryOptions,
+} from "./atoms/appEntryOptions.ts";
 import { type BuildOptions, buildOptions } from "./atoms/buildOptions.ts";
 
 export interface AlephaCliConfig {
+  entry?: AppEntryOptions;
   /**
    * Add custom commands to the Alepha CLI.
    *
@@ -54,6 +59,10 @@ export const defineConfig = (
       alepha.set(buildOptions, config.build);
     }
 
+    if (config.entry) {
+      alepha.set(appEntryOptions, config.entry);
+    }
+
     return {
       ...config.commands,
     };

package/src/cli/index.ts

@@ -1,12 +1,12 @@
 export * from "./apps/AlephaCli.ts";
 export * from "./apps/AlephaPackageBuilderCli.ts";
+export { default as AlephaPackageBuilderCli } from "./apps/AlephaPackageBuilderCli.ts";
 export * from "./atoms/changelogOptions.ts";
 export * from "./commands/build.ts";
 export * from "./commands/clean.ts";
 export * from "./commands/db.ts";
 export * from "./commands/deploy.ts";
 export * from "./commands/dev.ts";
-export * from "./commands/format.ts";
 export * from "./commands/gen/changelog.ts";
 export * from "./commands/gen/openapi.ts";
 export * from "./commands/init.ts";
@@ -16,6 +16,7 @@ export * from "./commands/test.ts";
 export * from "./commands/typecheck.ts";
 export * from "./commands/verify.ts";
 export * from "./defineConfig.ts";
+export * from "./providers/AppEntryProvider.ts";
 export * from "./services/AlephaCliUtils.ts";
 export * from "./services/GitMessageParser.ts";
 export * from "./version.ts";

package/src/cli/providers/AppEntryProvider.ts

@@ -0,0 +1,131 @@
+import { $inject, $use, AlephaError } from "alepha";
+import { FileSystemProvider } from "alepha/file";
+import { appEntryOptions } from "../atoms/appEntryOptions.ts";
+
+/**
+ * Service for locating entry files in Alepha projects.
+ *
+ * Originally in alepha/vite, moved to CLI to avoid cli -> vite dependency.
+ */
+export class AppEntryProvider {
+  protected readonly fs = $inject(FileSystemProvider);
+  protected readonly options = $use(appEntryOptions);
+
+  protected readonly serverEntries = [
+    "main.server.ts",
+    "main.server.tsx",
+    "main.ts",
+    "main.tsx",
+  ] as const;
+
+  protected readonly browserEntries = [
+    "main.browser.ts",
+    "main.browser.tsx",
+    "main.ts",
+    "main.tsx",
+  ] as const;
+
+  protected readonly styleEntries = [
+    "main.css",
+    "styles.css",
+    "style.css",
+  ] as const;
+
+  /**
+   * Get application entry points.
+   *
+   * Server entry is required, an error is thrown if not found.
+   * Browser entry is optional.
+   *
+   * It will first check for custom entries in options, see appEntryOptions.
+   */
+  public async getAppEntry(root: string): Promise<AppEntry> {
+    const appEntry: AppEntry = {
+      root,
+      server: "",
+    };
+
+    if (this.options.server) {
+      const serverExists = await this.fs.exists(
+        this.fs.join(root, this.options.server),
+      );
+      if (!serverExists) {
+        throw new AlephaError(
+          `Custom server entry "${this.options.server}" not found.`,
+        );
+      }
+      appEntry.server = this.options.server;
+    }
+
+    if (this.options.browser) {
+      const browserExists = await this.fs.exists(
+        this.fs.join(root, this.options.browser),
+      );
+      if (!browserExists) {
+        throw new AlephaError(
+          `Custom browser entry "${this.options.browser}" not found.`,
+        );
+      }
+      appEntry.browser = this.options.browser;
+    }
+
+    if (this.options.style) {
+      const styleExists = await this.fs.exists(
+        this.fs.join(root, this.options.style),
+      );
+      if (!styleExists) {
+        throw new AlephaError(
+          `Custom style entry "${this.options.style}" not found.`,
+        );
+      }
+      appEntry.style = this.options.style;
+    }
+
+    const srcFiles = await this.fs.ls(this.fs.join(root, "src"));
+
+    if (!appEntry.server) {
+      // find in conventional locations
+      for (const entry of this.serverEntries) {
+        if (srcFiles.includes(entry)) {
+          appEntry.server = this.fs.join("src", entry);
+          break;
+        }
+      }
+    }
+
+    if (!appEntry.server) {
+      throw new AlephaError(
+        "No server entry found. Please, add a main.server.ts file in the src/ directory or configure a custom entry in alepha.config.ts.",
+      );
+    }
+
+    if (!appEntry.browser) {
+      // find in conventional locations
+      for (const entry of this.browserEntries) {
+        if (srcFiles.includes(entry)) {
+          appEntry.browser = this.fs.join("src", entry);
+          break;
+        }
+      }
+    }
+
+    if (!appEntry.style) {
+      // find in conventional locations
+      for (const entry of this.styleEntries) {
+        if (srcFiles.includes(entry)) {
+          appEntry.style = this.fs.join("src", entry);
+          break;
+        }
+      }
+    }
+
+    return appEntry;
+  }
+}
+
+export interface AppEntry {
+  root: string;
+  server: string;
+  browser?: string;
+  style?: string;
+}

package/src/cli/providers/ViteBuildProvider.ts

@@ -0,0 +1,82 @@
+import { $hook, $inject, type Alepha, AlephaError } from "alepha";
+import { importVite } from "alepha/vite";
+import type { InlineConfig, ViteDevServer } from "vite";
+import type { AppEntry } from "./AppEntryProvider.ts";
+import { ViteTemplateProvider } from "./ViteTemplateProvider.ts";
+
+export class ViteBuildProvider {
+  protected alepha?: Alepha;
+  protected appEntry?: AppEntry;
+  protected viteDevServer?: ViteDevServer;
+  protected readonly templateProvider = $inject(ViteTemplateProvider);
+
+  /**
+   * We need to close the Vite dev server after build is done.
+   */
+  protected onReady = $hook({
+    on: "ready",
+    priority: "last",
+    handler: async () => {
+      await this.viteDevServer?.close();
+    },
+  });
+  protected onStop = $hook({
+    on: "stop",
+    handler: async () => {
+      await this.viteDevServer?.close();
+    },
+  });
+
+  public async init(opts: { entry: AppEntry }) {
+    const { createServer } = await importVite();
+
+    process.env.ALEPHA_CLI_IMPORT = "true"; // signal Alepha App about CLI import, run(alepha) won't start server
+    process.env.NODE_ENV = "production"; // force Alepha App in production mode for getting "production" metadata
+    process.env.LOG_LEVEL ??= "warn"; // reduce log noise
+
+    /**
+     * 01/26 Vite 7
+     * "runnerImport" doesn't work as expected here. (e.g. build docs fail)
+     * -> We still use devServer and ssrLoadModule for now.
+     * -> This is clearly a bad stuff, we need to find better way.
+     */
+    this.viteDevServer = await createServer({
+      server: { middlewareMode: true },
+      appType: "custom",
+      logLevel: "silent",
+    } satisfies InlineConfig);
+
+    await this.viteDevServer.ssrLoadModule(opts.entry.server);
+
+    const alepha: Alepha = (globalThis as any).__alepha;
+    if (!alepha) {
+      throw new AlephaError(
+        "Alepha instance not found after loading entry module",
+      );
+    }
+
+    this.alepha = alepha;
+    this.appEntry = opts.entry;
+
+    return alepha;
+  }
+
+  public hasClient(): boolean {
+    if (!this.alepha) {
+      throw new AlephaError("ViteBuildProvider not initialized");
+    }
+    try {
+      this.alepha.inject("ReactServerProvider");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  public generateIndexHtml(): string {
+    if (!this.appEntry) {
+      throw new AlephaError("ViteBuildProvider not initialized");
+    }
+    return this.templateProvider.generateIndexHtml(this.appEntry);
+  }
+}