alepha 0.21.2 → 0.22.0

package/src/cli/{platform → platform-lib}/__tests__/NamingService.spec.ts

@@ -1,12 +1,16 @@
-import { Alepha } from "alepha";
+import { Alepha, AlephaError } from "alepha";
 import { describe, expect, it } from "vitest";
-import { NamingService } from "../services/NamingService.ts";
+import {
+  NamingService,
+  resolveTenant,
+  tenantDomain,
+} from "../services/NamingService.ts";
 
 describe("NamingService", () => {
-  const createNaming = (project: string, env: string) => {
+  const createNaming = (project: string, env: string, tenant?: string) => {
     const alepha = Alepha.create();
     const naming = alepha.inject(NamingService);
-    return naming.forContext(project, env);
+    return naming.forContext(project, env, tenant);
   };
 
   // ─────────────────────────────────────────────────────────────────────────────
@@ -122,4 +126,87 @@ describe("NamingService", () => {
       expect(ctx.worker()).toBe("acme-portal-staging");
     });
   });
+
+  // ─────────────────────────────────────────────────────────────────────────────
+  // tenant prefix
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  describe("tenant prefix", () => {
+    it("prefixes every resource with the tenant slug", () => {
+      const ctx = createNaming("club", "production", "b14");
+
+      expect(ctx.worker()).toBe("b14-club-production");
+      expect(ctx.d1()).toBe("b14-club-production");
+      expect(ctx.r2()).toBe("b14-club-production");
+      expect(ctx.kv()).toBe("b14-club-production");
+      expect(ctx.queue()).toBe("b14-club-production");
+    });
+
+    it("omits the tenant segment when no tenant is given", () => {
+      expect(createNaming("club", "production").worker()).toBe(
+        "club-production",
+      );
+    });
+
+    it("slugifies the tenant segment too", () => {
+      expect(createNaming("club", "production", "B14").worker()).toBe(
+        "b14-club-production",
+      );
+    });
+  });
+
+  // ─────────────────────────────────────────────────────────────────────────────
+  // resolveTenant (tenancy matrix)
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  describe("resolveTenant", () => {
+    it("none (default): no tenant is fine, a tenant errors", () => {
+      expect(resolveTenant(undefined, undefined)).toBeUndefined();
+      expect(resolveTenant("none", undefined)).toBeUndefined();
+      expect(() => resolveTenant("none", "b14")).toThrow(AlephaError);
+    });
+
+    it("required: tenant mandatory", () => {
+      expect(resolveTenant("required", "b14")).toBe("b14");
+      expect(() => resolveTenant("required", undefined)).toThrow(AlephaError);
+    });
+
+    it("optional: both base and tenant instances allowed", () => {
+      expect(resolveTenant("optional", undefined)).toBeUndefined();
+      expect(resolveTenant("optional", "b14")).toBe("b14");
+    });
+
+    it("rejects a non-slug tenant value", () => {
+      expect(() => resolveTenant("required", "B14")).toThrow(AlephaError);
+      expect(() => resolveTenant("required", "b14.club")).toThrow(AlephaError);
+      expect(() => resolveTenant("required", "-b14")).toThrow(AlephaError);
+    });
+  });
+
+  // ─────────────────────────────────────────────────────────────────────────────
+  // tenantDomain
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  describe("tenantDomain", () => {
+    it("prepends the tenant as the leftmost DNS label", () => {
+      expect(tenantDomain("alepha.club", "b14")).toBe("b14.alepha.club");
+      expect(tenantDomain("club.alepha.dev", "sandbox")).toBe(
+        "sandbox.club.alepha.dev",
+      );
+    });
+
+    it("returns the base domain unchanged with no tenant", () => {
+      expect(tenantDomain("alepha.club", undefined)).toBe("alepha.club");
+    });
+
+    it("an override wins outright (V2 custom domain seam)", () => {
+      expect(
+        tenantDomain("alepha.club", "b14", "reservation.club-b14.fr"),
+      ).toBe("reservation.club-b14.fr");
+    });
+
+    it("passes through an undefined base", () => {
+      expect(tenantDomain(undefined, "b14")).toBeUndefined();
+    });
+  });
 });

package/src/cli/{platform → platform-lib}/__tests__/VercelAdapter.spec.ts

@@ -175,7 +175,14 @@ describe("VercelAdapter", () => {
     project: "acme-portal",
     env: "production",
     envConfig: { adapter: "vercel" },
-    apps: [],
+    entry: { root: "/project", server: "src/main.ts" },
+    resources: {
+      hasDatabase: false,
+      hasBucket: false,
+      hasKV: false,
+      hasQueue: false,
+      hasCron: false,
+    },
     root: "/project",
     naming: naming.forContext("acme-portal", "production"),
     ...overrides,
@@ -229,20 +236,14 @@ describe("VercelAdapter", () => {
     }) => {
       const { adapter, fs, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       // Pre-seed the project so upsertEnvVars has a target
@@ -282,20 +283,14 @@ describe("VercelAdapter", () => {
     test("filters out VITE_* and NODE_ENV", async ({ expect }) => {
       const { adapter, fs, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       api.projects.push({
@@ -327,20 +322,14 @@ describe("VercelAdapter", () => {
     test("skips when no env file exists", async ({ expect }) => {
       const { adapter, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       let upsertCalled = false;
@@ -363,20 +352,14 @@ describe("VercelAdapter", () => {
     test("returns project state with deployment info", async ({ expect }) => {
       const { adapter, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       // Pre-seed project and deployments
@@ -407,20 +390,14 @@ describe("VercelAdapter", () => {
     test("returns env var deployment status", async ({ expect }) => {
       const { adapter, fs, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       api.projects.push({
@@ -461,20 +438,14 @@ describe("VercelAdapter", () => {
     test("deletes projects via VercelApi.deleteProject", async ({ expect }) => {
       const { adapter, naming, api } = createTestEnv();
       const ctx = makeCtx(naming, {
-        apps: [
-          {
-            name: "api",
-            path: "apps/api",
-            entry: { root: "/project/apps/api", server: "src/main.ts" },
-            resources: {
-              hasDatabase: false,
-              hasBucket: false,
-              hasKV: false,
-              hasQueue: false,
-              hasCron: false,
-            },
-          },
-        ],
+        entry: { root: "/project", server: "src/main.ts" },
+        resources: {
+          hasDatabase: false,
+          hasBucket: false,
+          hasKV: false,
+          hasQueue: false,
+          hasCron: false,
+        },
       });
 
       // Pre-seed project