@webstudio-is/plans 0.260.2 → 0.261.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/plans",
-  "version": "0.260.2",
+  "version": "0.261.1",
   "description": "Plan features and billing logic for Webstudio",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -11,8 +11,8 @@
   },
   "devDependencies": {
     "vitest": "^3.1.2",
-    "@webstudio-is/postgrest": "0.260.2",
-    "@webstudio-is/tsconfig": "1.0.7"
+    "@webstudio-is/tsconfig": "1.0.7",
+    "@webstudio-is/postgrest": "0.261.1"
   },
   "exports": {
     ".": {

package/src/index.server.ts

@@ -1,6 +1,7 @@
 export * from "./index";
 export {
   getPlanInfo,
+  getPaidSeats,
   getAuthorizationOwnerId,
   parsePlansEnv,
   parseProductMeta,

package/src/index.ts

@@ -3,4 +3,4 @@ export {
   defaultPlanFeatures,
   parsePlansEnv,
 } from "./plan-features";
-export type { PlanFeatures, Purchase } from "./plan-features";
+export type { PlanFeatures, Purchase, PlanConfig } from "./plan-features";

package/src/plan-client.server.test.ts

@@ -8,7 +8,7 @@ import {
 import { type PlanFeatures, defaultPlanFeatures } from "./plan-features";
 import { getPlanInfo, __testing__ } from "./plan-client.server";
 
-const { parseProductMeta, mergeProductMetas, resetProductCache } = __testing__;
+const { parseProductMeta, mergeProductMetas } = __testing__;
 
 // ---------------------------------------------------------------------------
 // Unit tests for private helpers
@@ -17,7 +17,6 @@ const { parseProductMeta, mergeProductMetas, resetProductCache } = __testing__;
 const server = createTestServer();
 
 beforeEach(() => {
-  resetProductCache();
   vi.unstubAllEnvs();
 });
 
@@ -137,23 +136,6 @@ describe("getPlanInfo (msw)", () => {
     const result = await getPlanInfo(["user-1"], testContext);
     expect(result.get("user-1")?.purchases[0].planName).toBe("Pro");
   });
-
-  test("Product table is queried only once across two calls (cache hit)", async () => {
-    vi.stubEnv("PLANS", JSON.stringify([]));
-    let productFetchCount = 0;
-    server.use(
-      db.get("UserProduct", () => json([proUserProduct])),
-      db.get("Product", () => {
-        productFetchCount += 1;
-        return json([proProduct]);
-      })
-    );
-
-    await getPlanInfo(["user-1"], testContext);
-    await getPlanInfo(["user-1"], testContext);
-
-    expect(productFetchCount).toBe(1);
-  });
 });
 
 /** Full-featured plan for use in tests — all booleans true, numeric limits at max */

package/src/plan-client.server.ts

@@ -75,22 +75,33 @@ type Product = { id: string; name: string; meta: unknown };
 // The promise itself is cached to deduplicate concurrent cold-start requests.
 let productCachePromise: Promise<Map<string, Product>> | undefined;
 
-const getProductCache = (
+const fetchProducts = (
   postgrest: PostgrestContext
-): Promise<Map<string, Product>> => {
-  if (productCachePromise !== undefined) {
-    return productCachePromise;
-  }
-  const promise: Promise<Map<string, Product>> = Promise.resolve(
+): Promise<Map<string, Product>> =>
+  Promise.resolve(
     postgrest.client.from("Product").select("id, name, meta")
   ).then((result) => {
     if (result.error) {
-      productCachePromise = undefined;
       console.error(result.error);
       throw new Error("Failed to fetch products");
     }
     return new Map(result.data.map((p) => [p.id, p as Product]));
   });
+
+const getProductCache = (
+  postgrest: PostgrestContext
+): Promise<Map<string, Product>> => {
+  // Skip caching in test environment so each test gets a fresh fetch.
+  if (process.env.VITEST !== undefined) {
+    return fetchProducts(postgrest);
+  }
+  if (productCachePromise !== undefined) {
+    return productCachePromise;
+  }
+  const promise = fetchProducts(postgrest);
+  promise.catch(() => {
+    productCachePromise = undefined;
+  });
   productCachePromise = promise;
   return promise;
 };
@@ -177,7 +188,7 @@ export const getPlanInfo = async (
         }
         return [
           {
-            ...(plansByName.get(product.name) ?? defaultPlanFeatures),
+            ...(plansByName.get(product.name)?.features ?? defaultPlanFeatures),
             ...parseProductMeta(product.meta),
           },
         ];
@@ -194,15 +205,48 @@ export const getPlanInfo = async (
   );
 };
 
-/** Resets the module-level product cache. Only for use in tests. */
-const resetProductCache = () => {
-  productCachePromise = undefined;
+/**
+ * Returns the Stripe subscription item quantity for the given user, derived
+ * from the latest customer.subscription.updated/created event in TransactionLog.
+ * Returns null when no subscription event exists yet (free plan, AppSumo, etc.).
+ */
+export const getPaidSeats = async (
+  userId: string,
+  context: { postgrest: PostgrestContext }
+): Promise<number | null> => {
+  const result = await context.postgrest.client
+    .from("TransactionLog")
+    .select("eventData")
+    .eq("userId", userId)
+    .in("eventType", [
+      "customer.subscription.updated",
+      "customer.subscription.created",
+    ])
+    .order("eventCreated", { ascending: false })
+    .limit(1)
+    .maybeSingle();
+
+  if (result.error) {
+    throw result.error;
+  }
+
+  const eventData = result.data?.eventData as
+    | {
+        data?: {
+          object?: {
+            items?: { data?: Array<{ quantity?: unknown }> };
+          };
+        };
+      }
+    | null
+    | undefined;
+  const rawQuantity = eventData?.data?.object?.items?.data?.[0]?.quantity;
+  return typeof rawQuantity === "number" ? rawQuantity : null;
 };
 
 export const __testing__ = {
   parseProductMeta,
   mergeProductMetas,
-  resetProductCache,
 };
 
 export const getAuthorizationOwnerId = (

package/src/plan-features.test.ts

@@ -1,6 +1,7 @@
 import { describe, test, expect } from "vitest";
 import {
   type PlanFeatures,
+  type PlanConfig,
   defaultPlanFeatures,
   parsePlansEnv,
 } from "./plan-features";
@@ -21,6 +22,13 @@ const fullFeatures: PlanFeatures = {
   maxProjectsAllowedPerUser: 100,
 };
 
+/** Helper to build expected PlanConfig objects in tests */
+const planConfig = (
+  name: string,
+  features: PlanFeatures,
+  prices: Record<string, string> = {}
+): PlanConfig => ({ name, features, prices });
+
 describe("parsePlansEnv", () => {
   const validEntry = JSON.stringify({ name: "Pro", features: fullFeatures });
   const twoEntries = JSON.stringify([
@@ -48,13 +56,14 @@ describe("parsePlansEnv", () => {
       ])
     );
     expect(result.size).toBe(2);
-    expect(result.get("LTD T2")).toEqual(result.get("Pro"));
+    expect(result.get("LTD T2")).toEqual(planConfig("LTD T2", fullFeatures));
+    expect(result.get("Pro")).toEqual(planConfig("Pro", fullFeatures));
   });
 
   test("entry with no features key and no extends resolves to defaultPlanFeatures", () => {
     const result = parsePlansEnv(JSON.stringify([{ name: "Free" }]));
     expect(result.size).toBe(1);
-    expect(result.get("Free")).toEqual(defaultPlanFeatures);
+    expect(result.get("Free")).toEqual(planConfig("Free", defaultPlanFeatures));
   });
 
   test("extends: child inherits parent features and overrides specific fields", () => {
@@ -65,9 +74,11 @@ describe("parsePlansEnv", () => {
       ])
     );
     expect(result.size).toBe(2);
-    expect(result.get("Team")!.canDownloadAssets).toBe(true);
-    expect(result.get("Team")!.maxWorkspaces).toBe(50);
-    expect(result.get("Pro")!.maxWorkspaces).toBe(fullFeatures.maxWorkspaces);
+    expect(result.get("Team")!.features.canDownloadAssets).toBe(true);
+    expect(result.get("Team")!.features.maxWorkspaces).toBe(50);
+    expect(result.get("Pro")!.features.maxWorkspaces).toBe(
+      fullFeatures.maxWorkspaces
+    );
   });
 
   test("extends: throws when extending an unknown plan", () => {
@@ -87,13 +98,46 @@ describe("parsePlansEnv", () => {
   test("parses a single valid entry", () => {
     const result = parsePlansEnv(`[${validEntry}]`);
     expect(result.size).toBe(1);
-    expect(result.get("Pro")).toEqual(fullFeatures);
+    expect(result.get("Pro")).toEqual(planConfig("Pro", fullFeatures));
+  });
+
+  test("parses prices from entry", () => {
+    const result = parsePlansEnv(
+      JSON.stringify([
+        {
+          name: "Pro",
+          features: fullFeatures,
+          prices: { monthly: "price_abc", yearly: "price_def" },
+        },
+      ])
+    );
+    expect(result.size).toBe(1);
+    expect(result.get("Pro")!.prices).toEqual({
+      monthly: "price_abc",
+      yearly: "price_def",
+    });
+  });
+
+  test("prices default to empty object when not provided", () => {
+    const result = parsePlansEnv(`[${validEntry}]`);
+    expect(result.get("Pro")!.prices).toEqual({});
+  });
+
+  test("skips entry with invalid prices (non-string value)", () => {
+    const result = parsePlansEnv(
+      JSON.stringify([
+        { name: "Bad", features: fullFeatures, prices: { monthly: 123 } },
+        { name: "Pro", features: fullFeatures },
+      ])
+    );
+    expect(result.size).toBe(1);
+    expect(result.get("Pro")).toBeDefined();
   });
 
   test("parses multiple valid entries", () => {
     const result = parsePlansEnv(twoEntries);
     expect(result.size).toBe(2);
-    expect(result.get("Workspaces")!.maxWorkspaces).toBe(10);
+    expect(result.get("Workspaces")!.features.maxWorkspaces).toBe(10);
   });
 
   test("skips entries with invalid features (wrong type), keeps valid ones", () => {
@@ -104,7 +148,7 @@ describe("parsePlansEnv", () => {
       ])
     );
     expect(result.size).toBe(1);
-    expect(result.get("Pro")).toEqual(fullFeatures);
+    expect(result.get("Pro")).toEqual(planConfig("Pro", fullFeatures));
   });
 
   test("partial features without extends fills in from defaultPlanFeatures", () => {
@@ -112,10 +156,9 @@ describe("parsePlansEnv", () => {
       JSON.stringify([{ name: "Pro", features: { canDownloadAssets: true } }])
     );
     expect(result.size).toBe(1);
-    expect(result.get("Pro")).toEqual({
-      ...defaultPlanFeatures,
-      canDownloadAssets: true,
-    });
+    expect(result.get("Pro")).toEqual(
+      planConfig("Pro", { ...defaultPlanFeatures, canDownloadAssets: true })
+    );
   });
 
   test("strips unknown keys from features", () => {
@@ -126,7 +169,7 @@ describe("parsePlansEnv", () => {
     );
     expect(result.size).toBe(1);
     expect(
-      (result.get("Pro") as Record<string, unknown>)["admin"]
+      (result.get("Pro")!.features as Record<string, unknown>)["admin"]
     ).toBeUndefined();
   });
 });

package/src/plan-features.ts

@@ -18,7 +18,7 @@ export const PlanFeaturesSchema = z.object({
   maxWorkspaces: z.number().nonnegative(),
   maxProjectsAllowedPerUser: z.number().nonnegative(),
   maxAssetsPerProject: z.number().nonnegative(),
-  minSeats: z.number().nonnegative(),
+  seatsIncluded: z.number().nonnegative(),
   maxSeatsPerWorkspace: z.number().nonnegative(),
 });
 
@@ -45,7 +45,7 @@ export const defaultPlanFeatures: PlanFeatures = {
   maxWorkspaces: 1,
   maxProjectsAllowedPerUser: 100,
   maxAssetsPerProject: 50,
-  minSeats: 0,
+  seatsIncluded: 0,
   maxSeatsPerWorkspace: 0,
 };
 
@@ -55,15 +55,24 @@ export type Purchase = {
   subscriptionId?: string;
 };
 
+const PricesSchema = z.record(z.string(), z.string());
+
+/** A parsed plan entry with resolved features and price IDs keyed by billing cycle */
+export type PlanConfig = {
+  name: string;
+  features: PlanFeatures;
+  prices: Record<string, string>;
+};
+
 /**
- * Parse the PLANS env variable (JSON array of {name, extends?, features}).
+ * Parse the PLANS env variable (JSON array of {name, extends?, features, prices?}).
  * - features is partial when extends is used; the parent plan fills in the rest.
  * - The final merged features are validated against the full PlanFeaturesSchema.
  * - Invalid entries are skipped with a console.error.
  * - An extends reference to an unknown plan name throws an error.
- * Returns a Map of plan name → resolved PlanFeatures.
+ * Returns a Map of plan name → { name, features, prices }.
  */
-export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
+export const parsePlansEnv = (raw: string): Map<string, PlanConfig> => {
   try {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) {
@@ -74,6 +83,7 @@ export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
       name: string;
       extends?: string;
       features: Partial<PlanFeatures>;
+      prices: Record<string, string>;
     };
 
     // First pass: validate entry structure and collect partial features.
@@ -90,13 +100,23 @@ export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
         console.error("Invalid PLANS entry (extends must be a string):", item);
         return [];
       }
-      const result = PlanFeaturesSchema.partial().safeParse(
+      const featuresResult = PlanFeaturesSchema.partial().safeParse(
         "features" in item ? item.features : {}
       );
-      if (!result.success) {
+      if (!featuresResult.success) {
         console.error(
           `Invalid PLANS entry "${item.name}" features:`,
-          result.error.flatten()
+          featuresResult.error.flatten()
+        );
+        return [];
+      }
+      const pricesResult = PricesSchema.safeParse(
+        "prices" in item ? item.prices : {}
+      );
+      if (!pricesResult.success) {
+        console.error(
+          `Invalid PLANS entry "${item.name}" prices:`,
+          pricesResult.error.flatten()
         );
         return [];
       }
@@ -104,7 +124,8 @@ export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
         {
           name: item.name,
           extends: "extends" in item ? (item.extends as string) : undefined,
-          features: result.data,
+          features: featuresResult.data,
+          prices: pricesResult.data,
         } satisfies PlanEntry,
       ];
     });
@@ -116,7 +137,7 @@ export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
 
     // Second pass: resolve extends and validate the full feature set.
     // Every entry implicitly extends defaultPlanFeatures; "extends" picks a named plan on top of that.
-    const resolved = new Map<string, PlanFeatures>();
+    const resolved = new Map<string, PlanConfig>();
     for (const entry of entries) {
       if (entry.extends !== undefined && !byName.has(entry.extends)) {
         throw new Error(
@@ -138,7 +159,11 @@ export const parsePlansEnv = (raw: string): Map<string, PlanFeatures> => {
         );
         continue;
       }
-      resolved.set(entry.name, result.data);
+      resolved.set(entry.name, {
+        name: entry.name,
+        features: result.data,
+        prices: entry.prices,
+      });
     }
     return resolved;
   } catch (error) {