alepha 0.20.1 → 0.20.3

package/src/cli/core/__tests__/init.spec.ts

@@ -493,6 +493,214 @@ describe("alepha init", () => {
     });
   });
 
+  // ─────────────────────────────────────────────────────────────────────────────
+  // SaaS preset (--saas flag)
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  describe("--saas flag", () => {
+    it("should imply --shadcn / --tailwind / --react / --api", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      // shadcn → components.json + main.css uses tailwind
+      expect(fs.wasWritten("/project/components.json")).toBe(true);
+      expect(
+        fs.wasWrittenMatching("/project/src/main.css", /@import "tailwindcss"/),
+      ).toBe(true);
+      // tailwind → vite.config.ts
+      expect(fs.wasWritten("/project/vite.config.ts")).toBe(true);
+      // react → web/ tree
+      expect(fs.wasWritten("/project/src/web/AppRouter.ts")).toBe(true);
+      expect(fs.wasWritten("/project/src/main.browser.ts")).toBe(true);
+      // api → api/ tree
+      expect(fs.wasWritten("/project/src/api/index.ts")).toBe(true);
+    });
+
+    it("should wire AlephaApiUsers into api/index.ts", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(
+        fs.wasWrittenMatching("/project/src/api/index.ts", /AlephaApiUsers/),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/api/index.ts",
+          /imports:\s*\[AlephaApiUsers\]/,
+        ),
+      ).toBe(true);
+    });
+
+    it("should scaffold src/api/providers/RealmProvider.ts with $realm", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(fs.wasWritten("/project/src/api/providers/RealmProvider.ts")).toBe(
+        true,
+      );
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/api/providers/RealmProvider.ts",
+          /\$realm\(/,
+        ),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/api/providers/RealmProvider.ts",
+          /adminEmails:/,
+        ),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/api/providers/RealmProvider.ts",
+          /\$permission\(\s*\{[\s\S]*group:\s*"admin"[\s\S]*name:\s*"ui"/,
+        ),
+      ).toBe(true);
+    });
+
+    it("should register RealmProvider in the API module", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/api/index.ts",
+          /services:\s*\[HelloController,\s*RealmProvider\]/,
+        ),
+      ).toBe(true);
+    });
+
+    it("should scaffold auth pages + AuthLayout", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(
+        fs.wasWritten("/project/src/web/components/auth/AuthLayout.tsx"),
+      ).toBe(true);
+      expect(fs.wasWritten("/project/src/web/components/auth/Login.tsx")).toBe(
+        true,
+      );
+      expect(
+        fs.wasWritten("/project/src/web/components/auth/Register.tsx"),
+      ).toBe(true);
+      expect(
+        fs.wasWritten("/project/src/web/components/auth/ResetPassword.tsx"),
+      ).toBe(true);
+      expect(
+        fs.wasWritten("/project/src/web/components/auth/VerifyEmail.tsx"),
+      ).toBe(true);
+    });
+
+    it("should scaffold admin AppShell + admin pages", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(
+        fs.wasWritten("/project/src/web/components/admin/AdminLayout.tsx"),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/web/components/admin/AdminLayout.tsx",
+          /AppShell/,
+        ),
+      ).toBe(true);
+      expect(fs.wasWritten("/project/src/web/components/admin/Users.tsx")).toBe(
+        true,
+      );
+      expect(
+        fs.wasWritten("/project/src/web/components/admin/Sessions.tsx"),
+      ).toBe(true);
+    });
+
+    it("should wire /auth and /admin routes into AppRouter", async () => {
+      const { fs, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/web/AppRouter.ts",
+          /authLayout\s*=\s*\$page/,
+        ),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/web/AppRouter.ts",
+          /adminLayout\s*=\s*\$page/,
+        ),
+      ).toBe(true);
+      expect(
+        fs.wasWrittenMatching(
+          "/project/src/web/AppRouter.ts",
+          /adminUsers\s*=\s*\$page/,
+        ),
+      ).toBe(true);
+    });
+
+    it("should default the shadcn preset to b0", async () => {
+      const { fs, shell, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--shadcn", root: "/project" });
+
+      expect(shell.wasCalledMatching(/shadcn\s+init.*--preset\s+b0\b/)).toBe(
+        true,
+      );
+    });
+
+    it("should let --shadcn <id> override the preset", async () => {
+      const { fs, shell, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, {
+        argv: "--shadcn bOgTgBE1b",
+        root: "/project",
+      });
+
+      expect(
+        shell.wasCalledMatching(/shadcn\s+init.*--preset\s+bOgTgBE1b\b/),
+      ).toBe(true);
+    });
+
+    it("should let --saas <id> override the preset", async () => {
+      const { fs, shell, cli, cmd, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, {
+        argv: "--saas bOgTgBE1b",
+        root: "/project",
+      });
+
+      expect(
+        shell.wasCalledMatching(/shadcn\s+init.*--preset\s+bOgTgBE1b\b/),
+      ).toBe(true);
+    });
+
+    it("should add the @alepha/saas registry bundle in one shot", async () => {
+      const { fs, cli, cmd, shell, json } = createTestEnv();
+      await setupProject(fs, json);
+
+      await cli.run(cmd.init, { argv: "--saas", root: "/project" });
+
+      expect(shell.wasCalledMatching(/shadcn\s+add\s+@alepha\/saas/)).toBe(
+        true,
+      );
+    });
+  });
+
   // ─────────────────────────────────────────────────────────────────────────────
   // Non-empty directory guard (codegen flags)
   // ─────────────────────────────────────────────────────────────────────────────
@@ -542,7 +750,7 @@ describe("alepha init", () => {
     });
 
     it("should check each codegen flag independently", async () => {
-      for (const flag of ["--react", "--ui", "--saas", "--tailwind"]) {
+      for (const flag of ["--react", "--tailwind"]) {
         const { fs, cli, cmd, json } = createTestEnv();
         await setupProject(fs, json);
         await fs.writeFile("/project/src/existing.ts", "export {}");

package/src/cli/core/commands/init.ts

@@ -37,21 +37,21 @@ export class InitCommand {
           description: "Include React dependencies and web module (src/web/)",
         }),
       ),
-      ui: t.optional(
+      tailwind: t.optional(
         t.boolean({
-          description:
-            "Include @alepha/ui (components, auth portal, admin portal)",
+          description: "Include Tailwind CSS with Vite plugin. Implies --react",
         }),
       ),
-      saas: t.optional(
-        t.boolean({
+      shadcn: t.optional(
+        t.union([t.boolean(), t.text()], {
           description:
-            "Include authentication, admin portal, API, UI, and React. Everything you need for a SaaS app.",
+            "Set up shadcn/ui (components.json, cn helper, theme tokens, alepha registry). Pass an optional preset id (default: b0). Implies --react and --tailwind",
         }),
       ),
-      tailwind: t.optional(
-        t.boolean({
-          description: "Include Tailwind CSS with Vite plugin. Implies --react",
+      saas: t.optional(
+        t.union([t.boolean(), t.text()], {
+          description:
+            "Scaffold a SaaS starter: auth (login/register/reset/verify) + admin panel (/admin AppShell with users/sessions/api-keys/parameters/audits). Pass an optional preset id (default: b0). Implies --shadcn and --api",
         }),
       ),
       test: t.optional(

package/src/cli/core/services/PackageManagerUtils.ts

@@ -297,7 +297,7 @@ export class PackageManagerUtils {
   public async removeYarn(root: string): Promise<void> {
     await this.removeFiles(root, [".yarn", ".yarnrc.yml", "yarn.lock"]);
     await this.editPackageJson(root, (pkg) => {
-      delete pkg.packageManager;
+      pkg.packageManager = undefined;
       return pkg;
     });
   }
@@ -305,7 +305,7 @@ export class PackageManagerUtils {
   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;
+      pkg.packageManager = undefined;
       return pkg;
     });
   }
@@ -402,9 +402,9 @@ export class PackageManagerUtils {
     };
 
     // Only include drizzle-kit when the project uses a database.
-    // React-only projects (--react without --api/--saas) don't need it.
-    const isReactOnly = modes.react && !modes.ui;
-    if (!isReactOnly) {
+    // - React-only projects skip it (no ORM in scope).
+    // - SaaS pulls AlephaApiUsers which DOES need a DB → keep drizzle-kit.
+    if (!modes.react || modes.saas) {
       devDependencies["drizzle-kit"] = alephaDeps["drizzle-kit"];
     }
 
@@ -428,14 +428,19 @@ export class PackageManagerUtils {
       scripts.test = "vitest run";
     }
 
-    if (modes.ui) {
-      dependencies["@alepha/ui"] = `^${version}`;
-      modes.react = true;
+    if (modes.tailwind) {
+      devDependencies.tailwindcss = alephaDeps.tailwindcss;
+      devDependencies["@tailwindcss/vite"] = alephaDeps["@tailwindcss/vite"];
     }
 
-    if (modes.tailwind) {
-      devDependencies.tailwindcss = "^4.2.0";
-      devDependencies["@tailwindcss/vite"] = "^4.2.0";
+    if (modes.shadcn) {
+      // Add `shadcn` CLI as a project devDep — `alepha init --shadcn` runs
+      // `yarn shadcn init` after install to scaffold components.json,
+      // theme tokens, cn() helper, and runtime deps (clsx, tailwind-merge,
+      // class-variance-authority, lucide-react, tw-animate-css). Keeping
+      // the CLI in the project lets users re-run `yarn shadcn add ...`
+      // without `npx`.
+      devDependencies.shadcn = alephaDeps.shadcn;
     }
 
     if (modes.react) {
@@ -467,9 +472,14 @@ export class PackageManagerUtils {
 
 export interface DependencyModes {
   react?: boolean;
-  ui?: boolean;
   expo?: boolean;
   tailwind?: boolean;
+  shadcn?: boolean;
+  /**
+   * SaaS starter: implies `shadcn` + adds the alepha auth + admin registry
+   * components on top via `shadcn add @alepha/...`.
+   */
+  saas?: boolean;
   test?: boolean;
   /**
    * Skip biome/vitest when inside a workspace package (they're at root).