@preprio/toolkit 0.6.0-alpha.6 → 0.6.0-alpha.7

package/dist/nextjs/graphql.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name2 in all)
@@ -15,12 +17,20 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/nextjs/graphql.ts
 var graphql_exports = {};
 __export(graphql_exports, {
-  PREPR_DECISIONS_COOKIE: () => PREPR_DECISIONS_COOKIE,
+  PREPR_ANY_ITEM_TAG: () => PREPR_ANY_ITEM_TAG,
   PREPR_DEFAULT_VARIANT: () => PREPR_DEFAULT_VARIANT,
   PreprError: () => PreprError,
   PreprStack: () => PreprStack,
@@ -29,6 +39,8 @@ __export(graphql_exports, {
   decisionsFrom: () => decisionsFrom,
   isPersonalizedResponse: () => isPersonalizedResponse,
   loadPreprSchema: () => loadPreprSchema,
+  preprCacheTags: () => preprCacheTags,
+  preprModelTag: () => preprModelTag,
   preprVariantProps: () => preprVariantProps,
   resolveVariants: () => resolveVariants,
   splitStack: () => splitStack,
@@ -36,9 +48,60 @@ __export(graphql_exports, {
   toVariantsQuery: () => toVariantsQuery
 });
 module.exports = __toCommonJS(graphql_exports);
+var nextCache = __toESM(require("next/cache"), 1);
+
+// src/core/graphql/cache-tags.ts
+var MAX_TAGS = 128;
+var MAX_TAG_LENGTH = 256;
+var PREPR_ANY_ITEM_TAG = "prepr:any";
+var PREPR_SCHEMA_TAG = "prepr:schema";
+var preprItemTag = (id) => `prepr:${id}`;
+var NOT_ALPHANUMERIC = /[^a-z0-9]/g;
+var preprModelTag = (model) => `prepr:model:${model.toLowerCase().replace(NOT_ALPHANUMERIC, "")}`;
+function preprModelTagsFor(document2, data, schema) {
+  const operation = document2.definitions.find(
+    (definition) => definition.kind === "OperationDefinition" && definition.operation === "query"
+  );
+  const root = schema.types[schema.queryType];
+  if (!operation || !root) return [];
+  const models = (type) => {
+    const members = schema.types[type]?.possibleTypes ?? [];
+    return members.length > 0 ? members : [type];
+  };
+  const tags = /* @__PURE__ */ new Set();
+  for (const selection of operation.selectionSet.selections) {
+    if (selection.kind !== "Field") continue;
+    const type = root.fields[selection.name.value]?.type;
+    const info = type ? schema.types[type] : void 0;
+    if (!type || !info) continue;
+    const items = info.fields.items?.type;
+    const key = (selection.alias ?? selection.name).value;
+    const found = typeof data === "object" && data !== null && data[key] != null;
+    const affected = items ? models(items) : found ? [] : models(type);
+    for (const model of affected) tags.add(preprModelTag(model));
+  }
+  return [...tags];
+}
+function preprCacheTags(data) {
+  const tags = /* @__PURE__ */ new Set();
+  const stack = [data];
+  while (stack.length > 0) {
+    const value = stack.pop();
+    if (typeof value !== "object" || value === null) continue;
+    const id = value._id;
+    if (typeof id === "string" && id !== "") {
+      const tag = preprItemTag(id);
+      if (tag.length > MAX_TAG_LENGTH) return [PREPR_ANY_ITEM_TAG];
+      tags.add(tag);
+      if (tags.size > MAX_TAGS) return [PREPR_ANY_ITEM_TAG];
+    }
+    for (const child of Object.values(value)) stack.push(child);
+  }
+  return [...tags];
+}
 
 // src/version.ts
-var VERSION = "0.6.0-alpha.6";
+var VERSION = "0.6.0-alpha.7";
 
 // src/core/features.ts
 function isEnabled(config) {
@@ -202,7 +265,10 @@ function decisionSelectionSet(set, typeName, path, ctx) {
         path,
         ctx
       );
-      if (pruned) {
+      if (!pruned) continue;
+      if (fragment.typeCondition.name.value === typeName) {
+        selections.push(...pruned.selections);
+      } else {
         selections.push(
           inlineFragment(fragment.typeCondition.name.value, [
             ...pruned.selections
@@ -212,13 +278,19 @@ function decisionSelectionSet(set, typeName, path, ctx) {
       continue;
     }
     if (selection.kind === "InlineFragment") {
+      const condition = selection.typeCondition?.name.value ?? typeName;
       const pruned = decisionSelectionSet(
         selection.selectionSet,
-        selection.typeCondition?.name.value ?? typeName,
+        condition,
         path,
         ctx
       );
-      if (pruned) selections.push({ ...selection, selectionSet: pruned });
+      if (!pruned) continue;
+      if (condition === typeName && !selection.directives?.length) {
+        selections.push(...pruned.selections);
+      } else {
+        selections.push({ ...selection, selectionSet: pruned });
+      }
       continue;
     }
     if (!selection.selectionSet) continue;
@@ -292,20 +364,58 @@ function toDecisionDocument(document2, schema, groupPaths, options) {
   const used = /* @__PURE__ */ new Set();
   collectVariables(pruned, used);
   collectVariables(operation.directives, used);
+  const shared = sharedContextFragment(schema);
   return {
     kind: "Document",
     definitions: [
+      ...shared ? [shared.definition] : [],
       {
         ...operation,
         name: operation.name && name(`${operation.name.value}Decision`),
         variableDefinitions: (operation.variableDefinitions ?? []).filter(
           (definition) => used.has(definition.variable.name.value)
         ),
-        selectionSet: pruned
+        selectionSet: shared ? shared.apply(pruned) : pruned
       }
     ]
   };
 }
+function sharedContextFragment(schema) {
+  const contextTypes = new Set(
+    Object.values(schema.types).flatMap(
+      (type) => type.hasContext ? [type.fields._context.type] : []
+    )
+  );
+  if (contextTypes.size !== 1) return null;
+  const [contextType] = contextTypes;
+  const fragmentName = "c";
+  const definition = {
+    kind: "FragmentDefinition",
+    name: name(fragmentName),
+    typeCondition: { kind: "NamedType", name: name(contextType) },
+    selectionSet: selectionSet(
+      ["kind", "group_id", "variant_id"].map(
+        (field) => ({ kind: "Field", name: name(field) })
+      )
+    )
+  };
+  const spread = {
+    kind: "FragmentSpread",
+    name: name(fragmentName)
+  };
+  const apply = (set) => selectionSet(
+    set.selections.map((selection) => {
+      if (selection.kind === "Field" && selection.alias?.value === PREPR_CONTEXT_ALIAS) {
+        return { ...selection, selectionSet: selectionSet([spread]) };
+      }
+      return "selectionSet" in selection && selection.selectionSet ? {
+        ...selection,
+        selectionSet: apply(selection.selectionSet)
+      } : selection;
+    })
+  );
+  return { definition, apply };
+}
 
 // src/core/variants/probe-document.ts
 function probeSelectionSet(set, fragments) {
@@ -886,6 +996,7 @@ function createVaryProbe(run, options) {
 }
 
 // src/core/graphql/client.ts
+var clientSchemas = /* @__PURE__ */ new WeakMap();
 function isParseableUrl(url) {
   try {
     new URL(url);
@@ -922,7 +1033,7 @@ function createPreprClient(options) {
   ));
   const variantsDocuments = /* @__PURE__ */ new Map();
   const decisionDocuments = /* @__PURE__ */ new Map();
-  return {
+  const client = {
     async query(document2, variables, queryOptions = {}) {
       const { variants, ...rest } = queryOptions;
       if (!variants) return run(document2, variables, rest);
@@ -934,10 +1045,10 @@ function createPreprClient(options) {
       return run(derived, variables, rest);
     },
     async decide(document2, variables, queryOptions = {}) {
-      const { from, topLevelOnly, ...rest } = queryOptions;
+      const { from, ...rest } = queryOptions;
       const paths = from === void 0 ? void 0 : personalizationPaths(from);
       if (paths && paths.size === 0) return /* @__PURE__ */ new Map();
-      const signature = paths ? [...paths].map(([path, types]) => `${path}:${[...types].sort().join(",")}`).sort().join("|") : topLevelOnly ? "top" : "*";
+      const signature = paths ? [...paths].map(([path, types]) => `${path}:${[...types].sort().join(",")}`).sort().join("|") : "*";
       let byPaths = decisionDocuments.get(document2);
       if (!byPaths) {
         byPaths = /* @__PURE__ */ new Map();
@@ -945,9 +1056,7 @@ function createPreprClient(options) {
       }
       let derived = byPaths.get(signature);
       if (derived === void 0) {
-        derived = toDecisionDocument(document2, await loadSchema(), paths, {
-          topLevelOnly: !paths && topLevelOnly
-        });
+        derived = toDecisionDocument(document2, await loadSchema(), paths);
         byPaths.set(signature, derived);
       }
       if (!derived) return /* @__PURE__ */ new Map();
@@ -961,6 +1070,8 @@ function createPreprClient(options) {
       (vary) => vary === null || SEGMENTS_VARY.test(vary)
     )
   };
+  clientSchemas.set(client, loadSchema);
+  return client;
 }
 
 // src/core/graphql/schema-loader.ts
@@ -987,69 +1098,15 @@ async function loadPreprSchema(url, options = {}) {
   return schema;
 }
 
-// src/core/refresh.ts
-var PREPR_REFRESH_COOKIE = "prepr_refresh";
-var PREPR_REFRESH_HEADER = "Prepr-Refresh";
-var REFRESH_MAX_PATHS = 5;
-var SAFE_PATH = /^\/(?![/\\])[\w\-./%]{0,200}$/;
-function safePath(path) {
-  return SAFE_PATH.test(path) ? path : void 0;
-}
-function isFresh(at, freshFor, now = Date.now()) {
-  const age = now - at;
-  return at > 0 && age >= 0 && age < freshFor;
-}
-function cleanEntries(entries) {
-  const out = [];
-  for (const entry of entries) {
-    if (out.length === REFRESH_MAX_PATHS) break;
-    if (safePath(entry.path) && !out.some((e) => e.path === entry.path)) {
-      out.push(entry);
-    }
-  }
-  return out;
-}
-function parseRefresh(raw) {
-  return cleanEntries(
-    (raw ?? "").split("|").map((pair) => {
-      const split = pair.lastIndexOf("~");
-      const at = Number(split < 0 ? "" : pair.slice(split + 1));
-      return {
-        path: split < 0 ? pair : pair.slice(0, split),
-        at: Number.isFinite(at) && at > 0 ? Math.floor(at) : 0
-      };
-    })
-  );
-}
-function serializeRefresh(entries) {
-  return cleanEntries(entries).map((entry) => `${entry.path}~${Math.floor(entry.at)}`).join("|");
-}
-function parseRefreshPaths(header) {
-  return cleanEntries(
-    (header ?? "").split("|").map((path) => ({ path, at: 0 }))
-  ).map((entry) => entry.path);
-}
-
 // src/nextjs/decisions.ts
-var PREPR_DECISIONS_COOKIE = "prepr_decisions";
+var PREPR_DECIDE_HEADER = "Prepr-Decide";
+var DEFAULT_DECISION = "*";
 var DECISIONS_MAX_GROUPS = 40;
 var SAFE_ID = /^[\w-]+$/;
-var SEEN_MAX_PAGES = 1e3;
-function parseDecisions(raw) {
-  const out = /* @__PURE__ */ new Map();
-  for (const pair of (raw ?? "").split("~")) {
-    const at = pair.indexOf(":");
-    const group = pair.slice(0, at);
-    if (at < 1 || !SAFE_ID.test(group)) continue;
-    out.set(
-      group,
-      pair.slice(at + 1).split("|").filter((variant) => SAFE_ID.test(variant))
-    );
-  }
-  return out;
-}
 function serializeDecisions(decisions) {
-  return [...decisions].slice(0, DECISIONS_MAX_GROUPS).map(([group, variants]) => `${group}:${variants.join("|")}`).join("~");
+  return [...decisions].filter(([group]) => SAFE_ID.test(group)).slice(0, DECISIONS_MAX_GROUPS).map(
+    ([group, variants]) => `${group}:${variants.filter((v) => SAFE_ID.test(v)).join("|")}`
+  ).join("~");
 }
 function forwardedHeaders(request, response) {
   const overridden = response.headers.get("x-middleware-override-headers");
@@ -1062,109 +1119,16 @@ function forwardedHeaders(request, response) {
   return getPreprHeadersFromHeaders(headers2);
 }
 var preprClientInternals = /* @__PURE__ */ new WeakMap();
-var DEFAULT_FRESH_FOR_MS = 1e4;
-async function decidePage(client, seenGroups, headers2, document2, variables, timeoutMs = 1e3) {
-  if (!await client.hasSegments(document2, variables)) return void 0;
-  const decided = await client.decide(document2, variables, {
-    topLevelOnly: true,
-    headers: headers2,
-    init: { signal: AbortSignal.timeout(timeoutMs) }
-  });
-  let byVariables = seenGroups.get(document2);
-  if (!byVariables) {
-    byVariables = /* @__PURE__ */ new Map();
-    seenGroups.set(document2, byVariables);
-  }
-  const pageKey = JSON.stringify(variables ?? null);
-  let groups = byVariables.get(pageKey);
-  if (!groups) {
-    if (byVariables.size >= SEEN_MAX_PAGES) {
-      byVariables.delete(byVariables.keys().next().value);
-    }
-    groups = /* @__PURE__ */ new Set();
-    byVariables.set(pageKey, groups);
-  }
-  for (const group of decided.keys()) groups.add(group);
-  return decided;
-}
-function writeDecisions(request, response, decided, paths) {
-  const next = /* @__PURE__ */ new Map();
-  for (const decisions of decided) {
-    for (const [group, variants] of decisions) {
-      if (SAFE_ID.test(group) && !next.has(group)) {
-        next.set(
-          group,
-          variants.filter((v) => SAFE_ID.test(v))
-        );
-      }
-    }
-  }
-  for (const [group, variants] of parseDecisions(
-    request.cookies.get(PREPR_DECISIONS_COOKIE)?.value
-  )) {
-    if (!next.has(group)) next.set(group, variants);
-  }
-  const options = {
-    path: "/",
-    sameSite: "lax",
-    httpOnly: false,
-    secure: request.nextUrl.protocol === "https:"
-  };
-  if (next.size > 0) {
-    response.cookies.set(
-      PREPR_DECISIONS_COOKIE,
-      serializeDecisions(next),
-      options
-    );
-  }
-  if (paths.length > 0) {
-    const at = Date.now();
-    response.cookies.set(
-      PREPR_REFRESH_COOKIE,
-      serializeRefresh([
-        ...paths.map((path) => ({ path, at })),
-        ...parseRefresh(request.cookies.get(PREPR_REFRESH_COOKIE)?.value)
-      ]),
-      options
-    );
-  }
-}
-function pagePath(request) {
-  return request.nextUrl.basePath + request.nextUrl.pathname;
-}
-function contextChanged(request, headers2) {
-  return headers2.get("Prepr-Customer-Id-Created") === "true" || headers2.has("Prepr-Segments") || [...request.nextUrl.searchParams.keys()].some(
-    (key) => key.startsWith("utm_")
-  );
-}
-async function resolveDecisionsWith(client, seenGroups, request, response, document2, variables, options) {
+async function decideView(client, headers2, page, timeoutMs = 3e3) {
+  const init = { signal: AbortSignal.timeout(timeoutMs) };
   try {
-    if (options?.onlyIf && !await options.onlyIf()) return;
-    const known = seenGroups.get(document2)?.get(JSON.stringify(variables ?? null));
-    const path = pagePath(request);
-    const headers2 = mergePreprHeaders(forwardedHeaders(request, response));
-    const stored = parseDecisions(
-      request.cookies.get(PREPR_DECISIONS_COOKIE)?.value
-    );
-    const decidedAt = parseRefresh(request.cookies.get(PREPR_REFRESH_COOKIE)?.value).find(
-      (entry) => entry.path === path
-    )?.at ?? 0;
-    const fresh = isFresh(decidedAt, options?.freshFor ?? DEFAULT_FRESH_FOR_MS);
-    if (fresh && known && !contextChanged(request, headers2) && [...known].every((group) => stored.has(group))) {
-      return;
-    }
-    const decided = await decidePage(
-      client,
-      seenGroups,
-      headers2,
-      document2,
-      variables,
-      options?.timeoutMs
-    );
-    if (!decided || decided.size === 0) return;
-    writeDecisions(request, response, [decided], [path]);
+    const decided = page.decision ? decisionsFrom(
+      (await client.query(page.decision, page.variables, { headers: headers2, init })).data
+    ) : await client.decide(page.document, page.variables, { headers: headers2, init });
+    return serializeDecisions(decided);
   } catch (error) {
     if (isFrameworkSignal(error)) throw error;
+    return DEFAULT_DECISION;
   }
 }
 
@@ -1181,66 +1145,6 @@ async function getPreprHeaders() {
 // src/nextjs/proxy.ts
 var import_server9 = require("next/server");
 
-// src/core/constants.ts
-var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
-var COOKIE_SEGMENT = "Prepr-Segments";
-var COOKIE_VARIANT = "Prepr-ABtesting";
-var COOKIE_UID = "__prepr_uid";
-var COOKIE_HUBSPOT = "hubspotutk";
-var PARAM_SEGMENT = "prepr_preview_segment";
-var PARAM_VARIANT = "prepr_preview_ab";
-var PARAM_HIDE_BAR = "prepr_hide_bar";
-var ONE_YEAR_SECONDS = 60 * 60 * 24 * 365;
-
-// src/nextjs/bucket.ts
-var PREPR_BUCKET_COOKIE = "prepr_ab_bucket";
-var isBucket = (value) => value === "A" || value === "B";
-function setBucketCookie(request, response, bucket) {
-  response.cookies.set(PREPR_BUCKET_COOKIE, bucket, {
-    path: "/",
-    sameSite: "lax",
-    // Readable on purpose: PreprStack's inline switch reads it before first
-    // paint. It holds only "A" or "B".
-    httpOnly: false,
-    secure: request.nextUrl.protocol === "https:",
-    maxAge: 60 * 60 * 24 * 365
-  });
-}
-async function resolvePreprBucket(request, response, options) {
-  const stored = request.cookies.get(PREPR_BUCKET_COOKIE)?.value;
-  const forced = response.headers.get("x-middleware-request-prepr-abtesting") ?? request.cookies.get(COOKIE_VARIANT)?.value;
-  if (options.preview && isBucket(forced)) {
-    if (forced !== stored) setBucketCookie(request, response, forced);
-    return forced;
-  }
-  if (isBucket(stored)) return stored;
-  if (options.onlyIf) {
-    const needed = await Promise.resolve().then(options.onlyIf).catch(() => true);
-    if (!needed) return "A";
-  }
-  const customerId = request.cookies.get(COOKIE_UID)?.value ?? response.cookies.get(COOKIE_UID)?.value;
-  if (!customerId) return "A";
-  try {
-    const res = await fetch(options.url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Prepr-Customer-Id": customerId
-      },
-      body: JSON.stringify({ query: "{ __typename }" }),
-      cache: "no-store",
-      signal: AbortSignal.timeout(options.timeoutMs ?? 1500)
-    });
-    const bucket = res.headers.get("x-prepr-customer-bucket");
-    if (isBucket(bucket)) {
-      setBucketCookie(request, response, bucket);
-      return bucket;
-    }
-  } catch {
-  }
-  return "A";
-}
-
 // src/nextjs/draft.ts
 var import_headers2 = require("next/headers");
 var import_navigation = require("next/navigation");
@@ -1268,6 +1172,17 @@ function preprDraftRedirect(request, options) {
 // src/nextjs/middleware.ts
 var import_server8 = require("next/server");
 
+// src/core/constants.ts
+var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
+var COOKIE_SEGMENT = "Prepr-Segments";
+var COOKIE_VARIANT = "Prepr-ABtesting";
+var COOKIE_UID = "__prepr_uid";
+var COOKIE_HUBSPOT = "hubspotutk";
+var PARAM_SEGMENT = "prepr_preview_segment";
+var PARAM_VARIANT = "prepr_preview_ab";
+var PARAM_HIDE_BAR = "prepr_hide_bar";
+var ONE_YEAR_SECONDS = 60 * 60 * 24 * 365;
+
 // src/core/middleware.ts
 var UTM_PARAMS = [
   "utm_source",
@@ -1478,7 +1393,7 @@ function createPreprProxy(options) {
       "createPreprProxy"
     );
   }
-  const { client, seenGroups, url } = internals;
+  const { client } = internals;
   const preview = options.preview ?? false;
   const allowed = async (request) => {
     if (!options.onlyIf) return true;
@@ -1495,66 +1410,31 @@ function createPreprProxy(options) {
       return null;
     }
   };
-  async function refresh(request, response, paths) {
-    const answer = new import_server9.NextResponse(null, {
-      status: 204,
-      headers: { "Cache-Control": "no-store" }
-    });
-    for (const cookie of response.cookies.getAll()) answer.cookies.set(cookie);
+  async function answerDecision(request, response, target) {
+    let decision = DEFAULT_DECISION;
     const site = request.headers.get("sec-fetch-site");
-    if (request.method !== "GET" || site !== null && site !== "same-origin" || !await allowed(request)) {
-      return answer;
+    if (target && request.method === "GET" && (site === null || site === "same-origin") && await allowed(request)) {
+      decision = await decideView(
+        client,
+        mergePreprHeaders(forwardedHeaders(request, response)),
+        target,
+        options.timeoutMs
+      );
     }
-    const own = new Set(
-      parseRefresh(request.cookies.get(PREPR_REFRESH_COOKIE)?.value).map(
-        (entry) => entry.path
-      )
-    );
-    const basePath = request.nextUrl.basePath;
-    const headers2 = mergePreprHeaders(forwardedHeaders(request, response));
-    const decided = await Promise.all(
-      paths.map(async (path) => {
-        if (!own.has(path) || !path.startsWith(basePath)) return void 0;
-        const pathname = path.slice(basePath.length) || "/";
-        if (!isPagePath(pathname)) return void 0;
-        const target = lookup(new URL(pathname, request.url));
-        if (!target) return void 0;
-        try {
-          const decisions = await decidePage(
-            client,
-            seenGroups,
-            headers2,
-            target.document,
-            target.variables,
-            options.timeoutMs
-          );
-          return decisions?.size ? [path, decisions] : void 0;
-        } catch (error) {
-          if (isFrameworkSignal(error)) throw error;
-          return void 0;
-        }
-      })
-    );
-    const found = decided.filter((entry) => entry !== void 0);
-    writeDecisions(
-      request,
-      answer,
-      found.map(([, decisions]) => decisions),
-      found.map(([path]) => path)
-    );
+    const answer = new import_server9.NextResponse(decision, {
+      headers: {
+        "Cache-Control": "private, no-store",
+        "Content-Type": "text/plain; charset=utf-8"
+      }
+    });
+    for (const cookie of response.cookies.getAll()) answer.cookies.set(cookie);
     return answer;
   }
   return async (request) => {
-    if (request.headers.has(PREPR_REFRESH_HEADER)) {
-      return refresh(
-        request,
-        createPreprMiddleware(request, { preview, features: options.features }),
-        parseRefreshPaths(request.headers.get(PREPR_REFRESH_HEADER))
-      );
-    }
     const rendersPage = (request.method === "GET" || request.method === "HEAD") && isPagePath(request.nextUrl.pathname);
     const target = rendersPage ? lookup(request.nextUrl) : null;
-    if (target && preview) {
+    const decisionRequest = request.headers.has(PREPR_DECIDE_HEADER);
+    if (target && preview && !decisionRequest) {
       const draft = preprDraftRedirect(request, { preview });
       if (draft) return draft;
     }
@@ -1562,24 +1442,7 @@ function createPreprProxy(options) {
       preview,
       features: options.features
     });
-    if (target && await allowed(request)) {
-      await Promise.all([
-        resolvePreprBucket(request, response, {
-          url,
-          preview,
-          onlyIf: () => options.client.hasAbTests(target.document, target.variables)
-        }),
-        resolveDecisionsWith(
-          client,
-          seenGroups,
-          request,
-          response,
-          target.document,
-          target.variables,
-          { freshFor: options.freshFor, timeoutMs: options.timeoutMs }
-        )
-      ]);
-    }
+    if (decisionRequest) return answerDecision(request, response, target);
     return response;
   };
 }
@@ -1587,235 +1450,220 @@ function createPreprProxy(options) {
 // src/nextjs/stack.ts
 var import_react = require("react");
 
-// src/nextjs/ab-switch.ts
-function applyPreprAbBucket() {
-  const match = document.cookie.match(/(?:^|; )prepr_ab_bucket=([AB])(?:;|$)/);
-  const bucket = match ? match[1] : "A";
-  const state = window;
-  if (state.__preprAbBucket === bucket) return;
-  state.__preprAbBucket = bucket;
-  const css = bucket === "A" ? "" : '[data-prepr-ab="A"]{display:none!important}[data-prepr-ab="' + bucket + '"]{display:contents!important}';
-  try {
-    if (!state.__preprAbSheet) {
-      const sheet = new CSSStyleSheet();
-      document.adoptedStyleSheets = document.adoptedStyleSheets.concat(sheet);
-      state.__preprAbSheet = sheet;
-    }
-    state.__preprAbSheet.replaceSync(css);
-  } catch {
-    if (!state.__preprAbSheet) {
-      state.__preprAbSheet = document.createElement("style");
-      document.head.appendChild(state.__preprAbSheet);
-    }
-    state.__preprAbSheet.textContent = css;
-  }
-}
-function applyPreprDecisions(view) {
-  const viewState = window;
-  const current = view === void 0 ? location.pathname + location.search : view;
-  if (viewState.__preprDecisionsView === current) return;
-  viewState.__preprDecisionsView = current;
-  const match = document.cookie.match(/(?:^|; )prepr_decisions=([^;]*)/);
-  let raw;
-  try {
-    raw = match ? decodeURIComponent(match[1]) : "";
-  } catch {
-    raw = "";
-  }
+// src/nextjs/decision-switch.ts
+function applyPreprDecisions(decision) {
   const state = window;
-  if (state.__preprDecisions === raw) return;
-  state.__preprDecisions = raw;
-  const id = /^[\w-]+$/;
-  let css = "";
-  raw.split("~").forEach((pair) => {
-    const at = pair.indexOf(":");
-    const group = pair.slice(0, at);
-    if (at < 1 || !id.test(group)) return;
-    const selector = '[data-prepr-group="' + group + '"]';
-    css += selector + "{display:none!important}";
-    pair.slice(at + 1).split("|").forEach((variant) => {
-      if (id.test(variant)) {
-        css += selector + '[data-prepr-variant="' + variant + '"]{display:contents!important}';
-      }
+  const key = location.pathname + location.search;
+  if (decision !== void 0) state.__preprDecision = { key, value: decision };
+  const current = state.__preprDecision;
+  if (!current || current.key !== key) return false;
+  document.querySelectorAll("[data-prepr-decision]").forEach((marker) => {
+    marker.setAttribute("data-prepr-decided", "");
+  });
+  const defaults = current.value === "*";
+  const chosen = {};
+  current.value.split("~").forEach((pair) => {
+    const colon = pair.indexOf(":");
+    if (colon > 0)
+      chosen[pair.slice(0, colon)] = pair.slice(colon + 1).split("|");
+  });
+  document.querySelectorAll("[data-prepr-v]").forEach((element) => {
+    const nested = element.hasAttribute("data-prepr-nested");
+    const show = defaults ? element.hasAttribute("data-prepr-default") : (element.getAttribute("data-prepr-v") || "").split(" ").every((token) => {
+      const colon = token.indexOf(":");
+      const variant = token.slice(colon + 1);
+      const variants = chosen[token.slice(0, colon)];
+      return !!variants && (nested ? variants[0] === variant : variants.indexOf(variant) >= 0);
     });
+    if (show) element.setAttribute("data-prepr-show", "");
+    else element.removeAttribute("data-prepr-show");
   });
+  return true;
+}
+function startPreprDecision() {
+  const state = window;
+  const key = location.pathname + location.search;
+  if (state.__preprPending && state.__preprPending.key === key) return;
+  let last;
   try {
-    if (!state.__preprDecisionSheet) {
-      const sheet = new CSSStyleSheet();
-      document.adoptedStyleSheets = document.adoptedStyleSheets.concat(sheet);
-      state.__preprDecisionSheet = sheet;
-    }
-    state.__preprDecisionSheet.replaceSync(css);
+    last = JSON.parse(sessionStorage.getItem("prepr_decision") || "{}");
   } catch {
-    if (!state.__preprDecisionSheet) {
-      state.__preprDecisionSheet = document.createElement("style");
-      document.head.appendChild(state.__preprDecisionSheet);
+    last = {};
+  }
+  const age = Date.now() - (last.at || 0);
+  const value = last.key === key && typeof last.value === "string" && age >= 0 && age < 1e4 ? Promise.resolve(last.value) : fetch(key, {
+    headers: { "Prepr-Decide": "1" },
+    cache: "no-store",
+    credentials: "same-origin"
+  }).then((response) => response.ok ? response.text() : "*").catch(() => "*").then((answer) => {
+    try {
+      sessionStorage.setItem(
+        "prepr_decision",
+        JSON.stringify({ key, value: answer, at: Date.now() })
+      );
+    } catch {
     }
-    state.__preprDecisionSheet.textContent = css;
-  }
+    return answer;
+  });
+  state.__preprPending = { key, value };
+  value.then((answer) => {
+    if (location.pathname + location.search === key) state.__preprApply(answer);
+  });
 }
 
 // src/nextjs/stack.ts
 var import_components = require("./components.cjs");
-var AB_ATTRIBUTE = "data-prepr-ab";
-var AB_BUCKETS = ["A", "B"];
-var AB_BASE_CSS = `[${AB_ATTRIBUTE}]{display:contents}[${AB_ATTRIBUTE}]:not([${AB_ATTRIBUTE}="A"]){display:none}`;
-var AB_SWITCH_SCRIPT = `(${applyPreprAbBucket.toString()})();(${applyPreprDecisions.toString()})()`;
-var GROUP_ATTRIBUTE = "data-prepr-group";
-var VARIANT_ATTRIBUTE = "data-prepr-variant";
+var VARIANT_ATTRIBUTE = "data-prepr-v";
 var DEFAULT_ATTRIBUTE = "data-prepr-default";
-var GROUP_BASE_CSS = `[${GROUP_ATTRIBUTE}]{display:contents}[${GROUP_ATTRIBUTE}]:not([${DEFAULT_ATTRIBUTE}]){display:none}`;
+var NESTED_ATTRIBUTE = "data-prepr-nested";
+var GROUP_BASE_CSS = `[${VARIANT_ATTRIBUTE}]{display:none}[${VARIANT_ATTRIBUTE}][data-prepr-show]{display:contents}[data-prepr-decision]:not([data-prepr-decided])~[${VARIANT_ATTRIBUTE}][${DEFAULT_ATTRIBUTE}]{display:contents;visibility:hidden}`;
+var NOSCRIPT_HTML = `<style>[${VARIANT_ATTRIBUTE}][${DEFAULT_ATTRIBUTE}]{display:contents!important;visibility:visible!important}</style>`;
+var DECISION_SCRIPT = `window.__preprApply=${applyPreprDecisions.toString()};(${startPreprDecision.toString()})();`;
+var APPLY_SCRIPT = "__preprApply()";
 function variantKeysOf(items) {
   return items.flatMap((item) => {
-    const key = preprVariantProps(item)["data-prepr-variant-key"];
+    const key = preprVariantProps(item)["data-prepr-variant-key"] ?? nestedKeyOf(item);
     return key ? [key] : [];
   });
 }
-function renderBuckets(items, render, options) {
-  const {
-    bucket,
-    decisions,
-    abTest,
-    index,
-    track,
-    placeholder = false,
-    defaultVariant = true
-  } = options;
-  const renderVariant = (variant, key) => {
-    const resolved = resolveVariants(items, { decisions, bucket: variant });
-    const ab = abTest && !bucket ? variant : void 0;
-    const content = render(resolved, {
-      index,
-      placeholder,
-      defaultVariant: defaultVariant && (ab === void 0 || ab === "A")
-    });
-    const variantKeys = track ? variantKeysOf(resolved) : [];
-    if (variantKeys.length > 0) {
-      return (0, import_react.createElement)(
-        import_components.PreprVariantTracking,
-        { key, variantKeys, ab },
-        content
-      );
+function nestedKeyOf(value) {
+  if (!value || typeof value !== "object") return void 0;
+  for (const child of Object.values(value)) {
+    const items = Array.isArray(child) ? child : [child];
+    for (const item of items) {
+      const key = contextOf(item)?.variant_key ?? (item && nestedKeyOf(item));
+      if (key) return key;
     }
-    if (ab) return (0, import_react.createElement)("div", { key, [AB_ATTRIBUTE]: ab }, content);
-    return content;
+  }
+  return void 0;
+}
+function renderItems(items, render, options) {
+  const resolved = resolveVariants(items, {
+    decisions: options.decisions,
+    bucket: options.bucket
+  });
+  const content = render(resolved, {
+    index: options.index,
+    defaultVariant: options.defaultVariant
+  });
+  const variantKeys = options.track ? variantKeysOf(resolved) : [];
+  return variantKeys.length > 0 ? (0, import_react.createElement)(import_components.PreprVariantTracking, { variantKeys }, content) : content;
+}
+function decidedGroups(items, bucket) {
+  const groups = /* @__PURE__ */ new Map();
+  const walk = (value) => {
+    if (Array.isArray(value)) return value.forEach(walk);
+    if (!value || typeof value !== "object") return;
+    const ctx = contextOf(value);
+    const decided = ctx?.kind === "PERSONALIZATION" || ctx?.kind === "AB_TEST" && !bucket;
+    if (decided && ctx.variant_id) {
+      const group = groups.get(ctx.group_id) ?? {
+        variants: /* @__PURE__ */ new Set(),
+        fallback: ctx.kind === "AB_TEST" ? "A" : PREPR_DEFAULT_VARIANT
+      };
+      group.variants.add(ctx.variant_id);
+      groups.set(ctx.group_id, group);
+    }
+    Object.values(value).forEach(walk);
   };
-  if (!abTest || bucket) return renderVariant(bucket);
-  return AB_BUCKETS.map((variant) => renderVariant(variant, variant));
-}
-function renderAllVariants(block, render, options) {
-  const group = block.key.slice("group:".length);
-  const variants = [
-    ...new Set(
-      block.items.flatMap((item) => {
-        const ctx = item[PREPR_CONTEXT_ALIAS];
-        return ctx?.variant_id ? [ctx.variant_id] : [];
-      })
-    )
-  ];
-  return variants.map(
-    (variant) => (0, import_react.createElement)(
+  walk(items);
+  return groups;
+}
+function renderVariants(block, groups, render, options) {
+  const top = block.key.startsWith("group:") ? block.key.slice("group:".length) : void 0;
+  const nested = !(top !== void 0 && groups.size === 1);
+  const choices = [...groups].map(([group, { variants, fallback }]) => {
+    const ids = nested ? [fallback, ...variants] : [...variants];
+    return [...new Set(ids)].map((variant) => [group, variant]);
+  });
+  const combinations = choices.reduce(
+    (all, pairs) => all.flatMap((combo) => pairs.map((p) => [...combo, p])),
+    [[]]
+  );
+  return combinations.map((combination) => {
+    const pairs = combination.map(([group, variant]) => `${group}:${variant}`);
+    const isDefault = combination.every(
+      ([group, variant]) => variant === groups.get(group).fallback
+    );
+    return (0, import_react.createElement)(
       "div",
       {
-        key: variant,
-        [GROUP_ATTRIBUTE]: group,
-        [VARIANT_ATTRIBUTE]: variant,
-        ...variant === PREPR_DEFAULT_VARIANT ? { [DEFAULT_ATTRIBUTE]: "" } : {}
+        key: pairs.join(" "),
+        [VARIANT_ATTRIBUTE]: pairs.join(" "),
+        ...isDefault ? { [DEFAULT_ATTRIBUTE]: "" } : {},
+        ...nested ? { [NESTED_ATTRIBUTE]: "" } : {},
+        // The decision script marks the shown wrapper before hydration.
+        suppressHydrationWarning: true
       },
-      renderBuckets(block.items, render, {
+      renderItems(block.items, render, {
         bucket: options.bucket,
-        decisions: /* @__PURE__ */ new Map([[group, [variant]]]),
-        abTest: false,
+        decisions: new Map(combination.map(([g, v]) => [g, [v]])),
         index: block.index,
         track: options.track,
-        defaultVariant: variant === PREPR_DEFAULT_VARIANT
+        defaultVariant: isDefault
       })
-    )
-  );
-}
-async function PersonalizedBlock({
-  items,
-  decisions,
-  bucket,
-  abTest,
-  index,
-  render,
-  track
-}) {
-  const decided = await decisions.catch((error) => {
-    if (isFrameworkSignal(error)) throw error;
-    return void 0;
-  });
-  return renderBuckets(items, render, {
-    bucket,
-    decisions: decided,
-    abTest,
-    index,
-    track
+    );
   });
 }
 function PreprStack({
   items,
-  decisions,
   render,
   bucket,
   nonce,
-  trackVariants = false,
-  aboveTheFold = 1
+  trackVariants = false
 }) {
-  decisions.catch(() => void 0);
-  const blocks = splitStack(items);
-  const decidedInProxy = (block) => block.index < aboveTheFold && block.personalized && !block.abTest && block.key.startsWith("group:");
-  const hasDecided = blocks.some(decidedInProxy);
-  const needsSwitch = !bucket && blocks.some((block) => block.abTest) || hasDecided;
+  const blocks = splitStack(items).map((block) => ({
+    ...block,
+    groups: decidedGroups(block.items, bucket)
+  }));
+  const varies = blocks.some((block) => block.groups.size > 0);
   return (0, import_react.createElement)(
     import_react.Fragment,
     null,
-    needsSwitch && (0, import_react.createElement)(
+    varies && (0, import_react.createElement)(
       import_react.Fragment,
-      { key: "prepr-ab" },
+      { key: "prepr-switch" },
       (0, import_react.createElement)("style", {
         nonce,
-        dangerouslySetInnerHTML: {
-          __html: AB_BASE_CSS + (hasDecided ? GROUP_BASE_CSS : "")
-        }
+        dangerouslySetInnerHTML: { __html: GROUP_BASE_CSS }
+      }),
+      (0, import_react.createElement)("noscript", {
+        dangerouslySetInnerHTML: { __html: NOSCRIPT_HTML }
       }),
       (0, import_react.createElement)("script", {
         nonce,
-        dangerouslySetInnerHTML: { __html: AB_SWITCH_SCRIPT }
+        dangerouslySetInnerHTML: { __html: DECISION_SCRIPT }
       }),
-      (0, import_react.createElement)(import_components.PreprAbSwitch),
-      hasDecided && (0, import_react.createElement)(import_components.PreprPersonalizationSwitch, { refresh: false })
+      (0, import_react.createElement)(import_components.PreprDecisionApplier),
+      // Marked decided by the decision switch; never laid out.
+      (0, import_react.createElement)("template", {
+        "data-prepr-decision": "",
+        suppressHydrationWarning: true
+      })
     ),
     ...blocks.map((block) => {
-      if (decidedInProxy(block)) {
+      if (block.groups.size === 0) {
         return (0, import_react.createElement)(
           import_react.Fragment,
           { key: block.key },
-          renderAllVariants(block, render, { bucket, track: trackVariants })
+          renderItems(block.items, render, {
+            bucket,
+            index: block.index,
+            track: trackVariants,
+            defaultVariant: true
+          })
         );
       }
-      const fallback = renderBuckets(block.items, render, {
-        bucket,
-        abTest: block.abTest,
-        index: block.index,
-        track: trackVariants && !block.personalized,
-        placeholder: block.personalized
-      });
-      if (!block.personalized) {
-        return (0, import_react.createElement)(import_react.Fragment, { key: block.key }, fallback);
-      }
       return (0, import_react.createElement)(
-        import_react.Suspense,
-        { key: block.key, fallback },
-        (0, import_react.createElement)(PersonalizedBlock, {
-          items: block.items,
-          decisions,
+        import_react.Fragment,
+        { key: block.key },
+        renderVariants(block, block.groups, render, {
           bucket,
-          abTest: block.abTest,
-          index: block.index,
-          render,
           track: trackVariants
+        }),
+        (0, import_react.createElement)("script", {
+          nonce,
+          dangerouslySetInnerHTML: { __html: APPLY_SCRIPT }
         })
       );
     })
@@ -1827,33 +1675,59 @@ function createPreprClient2(options) {
   const { cacheTags = ["prepr"], revalidate, ...coreOptions } = options;
   const client = createPreprClient({
     // The schema introspection goes through the Data Cache: shared across
-    // server instances, refreshed hourly and by revalidateTag on publish.
+    // server instances, refreshed hourly and by a `schema.changed` webhook.
     schemaInit: {
-      next: { tags: cacheTags, revalidate: 3600 }
+      next: { tags: [...cacheTags, PREPR_SCHEMA_TAG], revalidate: 3600 }
     },
     ...coreOptions
   });
-  const seenGroups = /* @__PURE__ */ new Map();
   const nextClient = {
     async query(document2, variables, queryOptions = {}) {
-      const { personalize = false, ...rest } = queryOptions;
-      const init = rest.init;
-      const tagged = {
+      const { personalize = false, tagItems = false, ...rest } = queryOptions;
+      const { next, ...init } = rest.init ?? {};
+      if (tagItems && typeof nextCache.cacheTag !== "function") {
+        throw new Error("tagItems requires Next.js 16 or later.");
+      }
+      const options2 = {
         ...rest,
-        init: {
+        // With tagItems, `next` is dropped too: tags or revalidate alongside
+        // `no-store` are a conflict Next.js resolves by ignoring the store.
+        // Otherwise tags are attached unconditionally; the core client drops
+        // them again whenever the request ends up `no-store` (personalized,
+        // per-request headers, or preview).
+        init: tagItems ? { ...init, cache: "no-store" } : {
           ...init,
           next: {
-            tags: cacheTags,
             ...revalidate === void 0 ? {} : { revalidate },
-            ...init?.next
+            ...next,
+            // Merged, so a per-query tag never drops the client's own,
+            // which the publish webhook relies on.
+            tags: [...cacheTags, ...next?.tags ?? []]
           }
         }
       };
-      if (!personalize) return client.query(document2, variables, tagged);
-      return client.query(document2, variables, {
-        ...tagged,
-        headers: mergePreprHeaders(await getPreprHeaders(), rest.headers)
-      });
+      if (personalize) {
+        options2.headers = mergePreprHeaders(
+          await getPreprHeaders(),
+          rest.headers
+        );
+      }
+      const result = await client.query(document2, variables, options2);
+      if (tagItems) {
+        let modelTags;
+        try {
+          modelTags = preprModelTagsFor(
+            documentOf(document2),
+            result.data,
+            await clientSchemas.get(client)()
+          );
+        } catch {
+          modelTags = [PREPR_ANY_ITEM_TAG];
+        }
+        nextCache.cacheTag(...cacheTags, ...next?.tags ?? [], ...modelTags);
+        nextCache.cacheTag(...preprCacheTags(result.data));
+      }
+      return result;
     },
     async decide(document2, variables, queryOptions = {}) {
       return client.decide(document2, variables, {
@@ -1864,27 +1738,14 @@ function createPreprClient2(options) {
         )
       });
     },
-    hasAbTests: (document2, variables) => client.hasAbTests(document2, variables),
-    resolveDecisions: (request, response, document2, variables, options2) => resolveDecisionsWith(
-      client,
-      seenGroups,
-      request,
-      response,
-      document2,
-      variables,
-      options2
-    )
+    hasAbTests: (document2, variables) => client.hasAbTests(document2, variables)
   };
-  preprClientInternals.set(nextClient, {
-    client,
-    seenGroups,
-    url: coreOptions.url
-  });
+  preprClientInternals.set(nextClient, { client });
   return nextClient;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PREPR_DECISIONS_COOKIE,
+  PREPR_ANY_ITEM_TAG,
   PREPR_DEFAULT_VARIANT,
   PreprError,
   PreprStack,
@@ -1893,6 +1754,8 @@ function createPreprClient2(options) {
   decisionsFrom,
   isPersonalizedResponse,
   loadPreprSchema,
+  preprCacheTags,
+  preprModelTag,
   preprVariantProps,
   resolveVariants,
   splitStack,