alepha 0.14.4 → 0.15.1

package/src/cli/services/PackageManagerUtils.ts

@@ -0,0 +1,308 @@
+import { $inject, Alepha } from "alepha";
+import type { RunnerMethod } from "alepha/command";
+import { FileSystemProvider } from "alepha/file";
+import { $logger } from "alepha/logger";
+import { version } from "../version.ts";
+
+/**
+ * Utility service for package manager operations.
+ *
+ * Handles detection, installation, and cleanup for:
+ * - Yarn
+ * - npm
+ * - pnpm
+ * - Bun
+ */
+export class PackageManagerUtils {
+  protected readonly log = $logger();
+  protected readonly fs = $inject(FileSystemProvider);
+  protected readonly alepha = $inject(Alepha);
+
+  /**
+   * Detect the package manager used in the project.
+   */
+  public async getPackageManager(
+    root: string,
+    flags?: { yarn?: boolean; pnpm?: boolean; npm?: boolean; bun?: boolean },
+  ): Promise<"yarn" | "pnpm" | "npm" | "bun"> {
+    if (flags?.yarn) return "yarn";
+    if (flags?.pnpm) return "pnpm";
+    if (flags?.npm) return "npm";
+    if (flags?.bun) return "bun";
+    if (this.alepha.isBun()) return "bun";
+    if (await this.fs.exists(this.fs.join(root, "bun.lock"))) return "bun";
+    if (await this.fs.exists(this.fs.join(root, "yarn.lock"))) return "yarn";
+    if (await this.fs.exists(this.fs.join(root, "pnpm-lock.yaml")))
+      return "pnpm";
+    return "npm";
+  }
+
+  /**
+   * Get the install command for a package.
+   */
+  public async getInstallCommand(
+    root: string,
+    packageName: string,
+    dev = true,
+  ): Promise<string> {
+    const pm = await this.getPackageManager(root);
+    let cmd: string;
+
+    switch (pm) {
+      case "yarn":
+        cmd = `yarn add ${dev ? "-D" : ""} ${packageName}`;
+        break;
+      case "pnpm":
+        cmd = `pnpm add ${dev ? "-D" : ""} ${packageName}`;
+        break;
+      case "bun":
+        cmd = `bun add ${dev ? "-d" : ""} ${packageName}`;
+        break;
+      default:
+        cmd = `npm install ${dev ? "--save-dev" : ""} ${packageName}`;
+    }
+
+    return cmd.replace(/\s+/g, " ").trim();
+  }
+
+  /**
+   * Check if a dependency is installed in the project.
+   */
+  public async hasDependency(
+    root: string,
+    packageName: string,
+  ): Promise<boolean> {
+    try {
+      const pkg = await this.readPackageJson(root);
+      return !!(
+        pkg.dependencies?.[packageName] || pkg.devDependencies?.[packageName]
+      );
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Check if Expo is present in the project.
+   */
+  public async hasExpo(root: string): Promise<boolean> {
+    return this.hasDependency(root, "expo");
+  }
+
+  /**
+   * Check if React is present in the project.
+   */
+  public async hasReact(root: string): Promise<boolean> {
+    return this.hasDependency(root, "react");
+  }
+
+  /**
+   * Install a dependency if it's missing from the project.
+   */
+  public async ensureDependency(
+    root: string,
+    packageName: string,
+    options: {
+      dev?: boolean;
+      run?: RunnerMethod;
+      exec?: (
+        cmd: string,
+        opts?: { global?: boolean; root?: string },
+      ) => Promise<void>;
+    } = {},
+  ): Promise<void> {
+    const { dev = true } = options;
+
+    if (await this.hasDependency(root, packageName)) {
+      this.log.debug(`Dependency '${packageName}' is already installed`);
+      return;
+    }
+
+    const cmd = await this.getInstallCommand(root, packageName, dev);
+
+    if (options.run) {
+      await options.run(cmd, { alias: `add ${packageName}`, root });
+    } else if (options.exec) {
+      this.log.debug(`Installing ${packageName}`);
+      await options.exec(cmd, { global: true, root });
+    }
+  }
+
+  // ===========================================
+  // Package Manager Setup & Cleanup
+  // ===========================================
+
+  public async ensureYarn(root: string): Promise<void> {
+    const yarnrcPath = this.fs.join(root, ".yarnrc.yml");
+    if (!(await this.fs.exists(yarnrcPath))) {
+      await this.fs.writeFile(yarnrcPath, "nodeLinker: node-modules");
+    }
+    await this.removeAllPmFilesExcept(root, "yarn");
+  }
+
+  public async ensureBun(root: string): Promise<void> {
+    await this.removeAllPmFilesExcept(root, "bun");
+  }
+
+  public async ensurePnpm(root: string): Promise<void> {
+    await this.removeAllPmFilesExcept(root, "pnpm");
+  }
+
+  public async ensureNpm(root: string): Promise<void> {
+    await this.removeAllPmFilesExcept(root, "npm");
+  }
+
+  public async removeAllPmFilesExcept(
+    root: string,
+    except: string,
+  ): Promise<void> {
+    if (except !== "yarn") await this.removeYarn(root);
+    if (except !== "pnpm") await this.removePnpm(root);
+    if (except !== "npm") await this.removeNpm(root);
+    if (except !== "bun") await this.removeBun(root);
+  }
+
+  public async removeYarn(root: string): Promise<void> {
+    await this.removeFiles(root, [".yarn", ".yarnrc.yml", "yarn.lock"]);
+    await this.editPackageJson(root, (pkg) => {
+      delete pkg.packageManager;
+      return pkg;
+    });
+  }
+
+  public async removePnpm(root: string): Promise<void> {
+    await this.removeFiles(root, ["pnpm-lock.yaml", "pnpm-workspace.yaml"]);
+    await this.editPackageJson(root, (pkg) => {
+      delete pkg.packageManager;
+      return pkg;
+    });
+  }
+
+  public async removeNpm(root: string): Promise<void> {
+    await this.removeFiles(root, ["package-lock.json"]);
+  }
+
+  public async removeBun(root: string): Promise<void> {
+    await this.removeFiles(root, ["bun.lockb", "bun.lock"]);
+  }
+
+  // ===========================================
+  // Package.json utilities
+  // ===========================================
+
+  public async readPackageJson(root: string): Promise<Record<string, any>> {
+    const content = await this.fs
+      .createFile({ path: this.fs.join(root, "package.json") })
+      .text();
+    return JSON.parse(content);
+  }
+
+  public async writePackageJson(
+    root: string,
+    content: Record<string, any>,
+  ): Promise<void> {
+    await this.fs.writeFile(
+      this.fs.join(root, "package.json"),
+      JSON.stringify(content, null, 2),
+    );
+  }
+
+  public async editPackageJson(
+    root: string,
+    editFn: (pkg: Record<string, any>) => Record<string, any>,
+  ): Promise<void> {
+    try {
+      const pkg = await this.readPackageJson(root);
+      const updated = editFn(pkg);
+      await this.writePackageJson(root, updated);
+    } catch {
+      // package.json doesn't exist, skip
+    }
+  }
+
+  public async ensurePackageJson(
+    root: string,
+    modes: DependencyModes,
+  ): Promise<Record<string, any>> {
+    const packageJsonPath = this.fs.join(root, "package.json");
+
+    if (!(await this.fs.exists(packageJsonPath))) {
+      const content = this.generatePackageJsonContent(modes);
+      await this.writePackageJson(root, content);
+      return content;
+    }
+
+    const packageJson = await this.readPackageJson(root);
+    const newContent = this.generatePackageJsonContent(modes);
+
+    packageJson.type = "module";
+    packageJson.dependencies ??= {};
+    packageJson.devDependencies ??= {};
+    packageJson.scripts ??= {};
+
+    Object.assign(packageJson.dependencies, newContent.dependencies);
+    Object.assign(packageJson.devDependencies, newContent.devDependencies);
+    Object.assign(packageJson.scripts, newContent.scripts);
+
+    await this.writePackageJson(root, packageJson);
+    return packageJson;
+  }
+
+  public generatePackageJsonContent(modes: DependencyModes): {
+    dependencies: Record<string, string>;
+    devDependencies: Record<string, string>;
+    scripts: Record<string, string>;
+    type: "module";
+  } {
+    const dependencies: Record<string, string> = {
+      alepha: `^${version}`,
+    };
+
+    const devDependencies: Record<string, string> = {};
+
+    const scripts: Record<string, string> = {
+      dev: "alepha dev",
+      build: "alepha build",
+      lint: "alepha lint",
+      typecheck: "alepha typecheck",
+      verify: "alepha verify",
+    };
+
+    if (modes.ui) {
+      dependencies["@alepha/ui"] = `^${version}`;
+      modes.react = true;
+    }
+
+    if (modes.react) {
+      dependencies["@alepha/react"] = `^${version}`;
+      dependencies.react = "^19.2.0";
+      dependencies["react-dom"] = "^19.2.0";
+      devDependencies["@types/react"] = "^19.2.0";
+    }
+
+    return {
+      type: "module",
+      dependencies,
+      devDependencies,
+      scripts,
+    };
+  }
+
+  // ===========================================
+  // Helper methods
+  // ===========================================
+
+  protected async removeFiles(root: string, files: string[]): Promise<void> {
+    await Promise.all(
+      files.map((file) =>
+        this.fs.rm(this.fs.join(root, file), { force: true, recursive: true }),
+      ),
+    );
+  }
+}
+
+export interface DependencyModes {
+  react?: boolean;
+  ui?: boolean;
+  expo?: boolean;
+}

package/src/cli/services/ProjectScaffolder.ts

@@ -0,0 +1,329 @@
+import { basename, dirname } from "node:path";
+import { $inject } from "alepha";
+import { FileSystemProvider } from "alepha/file";
+import { $logger } from "alepha/logger";
+import { apiHelloControllerTs } from "../assets/apiHelloControllerTs.ts";
+import { apiIndexTs } from "../assets/apiIndexTs.ts";
+import { biomeJson } from "../assets/biomeJson.ts";
+import { type ClaudeMdOptions, claudeMd } from "../assets/claudeMd.ts";
+import { dummySpecTs } from "../assets/dummySpecTs.ts";
+import { editorconfig } from "../assets/editorconfig.ts";
+import { mainBrowserTs } from "../assets/mainBrowserTs.ts";
+import { mainCss } from "../assets/mainCss.ts";
+import { mainServerTs } from "../assets/mainServerTs.ts";
+import { tsconfigJson } from "../assets/tsconfigJson.ts";
+import { webAppRouterTs } from "../assets/webAppRouterTs.ts";
+import { webHelloComponentTsx } from "../assets/webHelloComponentTsx.ts";
+import { webIndexTs } from "../assets/webIndexTs.ts";
+import {
+  type DependencyModes,
+  PackageManagerUtils,
+} from "./PackageManagerUtils.ts";
+
+/**
+ * Service for scaffolding new Alepha projects.
+ *
+ * Handles creation of:
+ * - Project structure (src/api, src/web)
+ * - Configuration files (tsconfig, biome, editorconfig)
+ * - Entry points (main.server.ts, main.browser.ts)
+ * - Example code (HelloController, Hello component)
+ */
+export class ProjectScaffolder {
+  protected readonly log = $logger();
+  protected readonly fs = $inject(FileSystemProvider);
+  protected readonly pm = $inject(PackageManagerUtils);
+
+  /**
+   * Get the app name from the directory name.
+   *
+   * Converts the directory name to a valid module name:
+   * - Converts to lowercase
+   * - Replaces spaces, dashes, underscores with nothing
+   * - Falls back to "app" if empty
+   */
+  public getAppName(root: string): string {
+    const dirName = basename(root);
+    const appName = dirName.toLowerCase().replace(/[\s\-_]/g, "");
+    return appName || "app";
+  }
+
+  /**
+   * Ensure all configuration files exist.
+   */
+  public async ensureConfig(
+    root: string,
+    opts: {
+      force?: boolean;
+      packageJson?: boolean | DependencyModes;
+      tsconfigJson?: boolean;
+      indexHtml?: boolean;
+      biomeJson?: boolean;
+      editorconfig?: boolean;
+      claudeMd?: boolean | ClaudeMdOptions;
+    },
+  ): Promise<void> {
+    const tasks: Promise<void>[] = [];
+    const force = opts.force ?? false;
+
+    if (opts.packageJson) {
+      tasks.push(
+        this.pm
+          .ensurePackageJson(
+            root,
+            typeof opts.packageJson === "boolean" ? {} : opts.packageJson,
+          )
+          .then(() => {}),
+      );
+    }
+    if (opts.tsconfigJson) {
+      tasks.push(this.ensureTsConfig(root, { force }));
+    }
+    if (opts.indexHtml) {
+      tasks.push(this.ensureReactProject(root, { force }));
+    }
+    if (opts.biomeJson) {
+      tasks.push(this.ensureBiomeConfig(root, { force }));
+    }
+    if (opts.editorconfig) {
+      tasks.push(this.ensureEditorConfig(root, { force }));
+    }
+    if (opts.claudeMd) {
+      tasks.push(
+        this.ensureClaudeMd(
+          root,
+          typeof opts.claudeMd === "boolean"
+            ? { force }
+            : { ...opts.claudeMd, force },
+        ),
+      );
+    }
+
+    await Promise.all(tasks);
+  }
+
+  // ===========================================
+  // Config Files
+  // ===========================================
+
+  public async ensureTsConfig(
+    root: string,
+    opts: { force?: boolean } = {},
+  ): Promise<void> {
+    // Check if tsconfig.json exists in current or parent directories
+    if (!opts.force && (await this.existsInParents(root, "tsconfig.json"))) {
+      return;
+    }
+    await this.fs.writeFile(
+      this.fs.join(root, "tsconfig.json"),
+      tsconfigJson(),
+    );
+  }
+
+  public async ensureBiomeConfig(
+    root: string,
+    opts: { force?: boolean } = {},
+  ): Promise<void> {
+    await this.ensureFile(root, "biome.json", biomeJson(), opts.force);
+  }
+
+  public async ensureEditorConfig(
+    root: string,
+    opts: { force?: boolean } = {},
+  ): Promise<void> {
+    await this.ensureFile(root, ".editorconfig", editorconfig(), opts.force);
+  }
+
+  public async ensureClaudeMd(
+    root: string,
+    options: ClaudeMdOptions & { force?: boolean } = {},
+  ): Promise<void> {
+    await this.ensureFile(root, "CLAUDE.md", claudeMd(options), options.force);
+  }
+
+  // ===========================================
+  // API Project Structure
+  // ===========================================
+
+  /**
+   * Ensure src/main.server.ts exists with full API structure.
+   *
+   * Creates:
+   * - src/main.server.ts (entry point)
+   * - src/api/index.ts (API module)
+   * - src/api/controllers/HelloController.ts (example controller)
+   */
+  public async ensureApiProject(
+    root: string,
+    opts: { force?: boolean } = {},
+  ): Promise<void> {
+    const srcDir = this.fs.join(root, "src");
+
+    // Don't overwrite existing content unless force is set
+    if (!opts.force && (await this.fs.exists(srcDir))) {
+      const files = await this.fs.ls(srcDir);
+      if (files.length > 0) return;
+    }
+
+    const appName = this.getAppName(root);
+
+    // Create directories
+    await this.fs.mkdir(this.fs.join(root, "src/api/controllers"), {
+      recursive: true,
+    });
+
+    // Create files
+    await this.ensureFile(srcDir, "main.server.ts", mainServerTs(), opts.force);
+    await this.ensureFile(
+      srcDir,
+      "api/index.ts",
+      apiIndexTs({ appName }),
+      opts.force,
+    );
+    await this.ensureFile(
+      srcDir,
+      "api/controllers/HelloController.ts",
+      apiHelloControllerTs(),
+      opts.force,
+    );
+  }
+
+  // ===========================================
+  // React Project Structure
+  // ===========================================
+
+  /**
+   * Ensure full React project structure exists.
+   *
+   * Creates:
+   * - src/main.server.ts, src/main.browser.ts
+   * - src/api/index.ts, src/api/controllers/HelloController.ts
+   * - src/web/index.ts, src/web/AppRouter.ts, src/web/components/Hello.tsx
+   */
+  public async ensureReactProject(
+    root: string,
+    opts: { force?: boolean } = {},
+  ): Promise<void> {
+    const appName = this.getAppName(root);
+
+    // Create directories
+    await this.fs.mkdir(this.fs.join(root, "src/api/controllers"), {
+      recursive: true,
+    });
+    await this.fs.mkdir(this.fs.join(root, "src/web/components"), {
+      recursive: true,
+    });
+
+    // src/main.css
+    await this.ensureFile(root, "src/main.css", mainCss(), opts.force);
+
+    // API structure
+    await this.ensureFile(
+      root,
+      "src/api/index.ts",
+      apiIndexTs({ appName }),
+      opts.force,
+    );
+    await this.ensureFile(
+      root,
+      "src/api/controllers/HelloController.ts",
+      apiHelloControllerTs(),
+      opts.force,
+    );
+    await this.ensureFile(
+      root,
+      "src/main.server.ts",
+      mainServerTs({ react: true }),
+      opts.force,
+    );
+
+    // Web structure
+    await this.ensureFile(
+      root,
+      "src/web/index.ts",
+      webIndexTs({ appName }),
+      opts.force,
+    );
+    await this.ensureFile(
+      root,
+      "src/web/AppRouter.ts",
+      webAppRouterTs(),
+      opts.force,
+    );
+    await this.ensureFile(
+      root,
+      "src/web/components/Hello.tsx",
+      webHelloComponentTsx(),
+      opts.force,
+    );
+    await this.ensureFile(
+      root,
+      "src/main.browser.ts",
+      mainBrowserTs(),
+      opts.force,
+    );
+  }
+
+  // ===========================================
+  // Test Directory
+  // ===========================================
+
+  /**
+   * Ensure test directory exists with a dummy test file.
+   */
+  public async ensureTestDir(root: string): Promise<void> {
+    const testDir = this.fs.join(root, "test");
+    const dummyPath = this.fs.join(testDir, "dummy.spec.ts");
+
+    if (!(await this.fs.exists(testDir))) {
+      await this.fs.mkdir(testDir, { recursive: true });
+      await this.fs.writeFile(dummyPath, dummySpecTs());
+      return;
+    }
+
+    const files = await this.fs.ls(testDir);
+    if (files.length === 0) {
+      await this.fs.writeFile(dummyPath, dummySpecTs());
+    }
+  }
+
+  // ===========================================
+  // Helpers
+  // ===========================================
+
+  /**
+   * Write a file, optionally overriding if it exists.
+   */
+  protected async ensureFile(
+    root: string,
+    relativePath: string,
+    content: string,
+    force?: boolean,
+  ): Promise<void> {
+    const fullPath = this.fs.join(root, relativePath);
+    if (force || !(await this.fs.exists(fullPath))) {
+      await this.fs.writeFile(fullPath, content);
+    }
+  }
+
+  /**
+   * Check if a file exists in the given directory or any parent directory.
+   */
+  protected async existsInParents(
+    root: string,
+    filename: string,
+  ): Promise<boolean> {
+    let current = root;
+    while (true) {
+      if (await this.fs.exists(this.fs.join(current, filename))) {
+        return true;
+      }
+      const parent = dirname(current);
+      if (parent === current) {
+        // Reached filesystem root
+        return false;
+      }
+      current = parent;
+    }
+  }
+}

package/src/command/helpers/Runner.ts

@@ -20,6 +20,11 @@ export interface RunOptions {
    * Rename the command for logging purposes.
    */
   alias?: string;
+
+  /**
+   * Root directory to execute the command in.
+   */
+  root?: string;
 }
 
 export interface RunnerMethod {
@@ -73,11 +78,14 @@ export class Runner {
 
       this.firstTaskStarted = true;
 
+      const root =
+        typeof options === "object" && options.root ? options.root : undefined;
+
       if (Array.isArray(cmd)) {
         return await this.execute(
           cmd.map((it) =>
             typeof it === "string"
-              ? { name: it, handler: () => this.exec(it) }
+              ? { name: it, handler: () => this.exec(it, { root }) }
               : it,
           ),
         );
@@ -89,7 +97,7 @@ export class Runner {
         typeof options === "function"
           ? options
           : typeof cmd === "string"
-            ? () => this.exec(cmd)
+            ? () => this.exec(cmd, { root })
             : cmd.handler;
 
       return await this.execute({
@@ -140,11 +148,15 @@ export class Runner {
     return runFn;
   }
 
-  protected async exec(cmd: string): Promise<string> {
+  protected async exec(
+    cmd: string,
+    opts: { root?: string } = {},
+  ): Promise<string> {
     return await new Promise<string>((resolve, reject) => {
       exec(
         cmd,
         {
+          cwd: opts.root,
           env: {
             ...process.env,
             LOG_FORMAT: "pretty",

package/src/core/Alepha.ts

@@ -165,13 +165,6 @@ export class Alepha {
         ...state.env,
         ...process.env,
       };
-
-      // remove empty env variables
-      for (const key in state.env) {
-        if (state.env[key] === "") {
-          delete (state.env as any)[key];
-        }
-      }
     }
 
     // force production mode when building with vite
@@ -765,8 +758,9 @@ export class Alepha {
       }
 
       if (this.started) {
+        const mod = (service as WithModule)[MODULE]?.name;
         throw new ContainerLockedError(
-          `Container is locked. No more services can be added. ${parent?.name} -> ${service.name}`,
+          `Container is locked. No more services can be added. Attempted to inject '${service.name}' from '${parent?.name}'. ${mod ? `Maybe register module '${mod}' in Alepha.` : ""}`,
         );
       }
     }