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

package/dist/sveltekit/graphql.d.cts

@@ -95,39 +95,6 @@ interface PreprVariantProps {
  */
 declare function preprVariantProps(item: unknown): PreprVariantProps;
 
-/**
- * The schema facts the query rewrites need, from `loadPreprSchema`. Pass it
- * along; its shape is not part of the public API.
- */
-type PreprSchema = PreprSchemaInfo;
-/**
- * Your query, asking for every personalization and A/B variant: what
- * `query(..., { variants: true })` sends, as a string for your own GraphQL
- * client. The result is the same for every visitor, so cache it like any
- * other content query, and render it with `resolveVariants` or `PreprStack`.
- *
- * A query without personalizable fields comes back unchanged (minified).
- */
-declare function toVariantsQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema): string;
-/**
- * The per-visitor decision query for the same query: send it with the
- * visitor's Prepr headers, never cached, and pass the response's `data` to
- * `decisionsFrom`.
- *
- * Pass the variants result as `from` whenever you have it: the query then
- * asks only about the lists that hold segment groups on this page, which is
- * a few hundred bytes instead of the whole page and markedly faster for a
- * visitor Prepr has not seen before. Without `from` it asks about every
- * personalizable list. `topLevelOnly` stops at the first personalizable list
- * on each path, for middleware that decides only the top of a stack.
- *
- * Null when there is nothing to decide: send no request then.
- */
-declare function toDecisionQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema, options?: {
-    from?: unknown;
-    topLevelOnly?: boolean;
-}): string | null;
-
 /**
  * A GraphQL document accepted by `query`: a plain string, graphql-codegen's
  * `TypedDocumentString` (`documentMode: 'string'`), or any `DocumentNode`,
@@ -221,11 +188,6 @@ interface PreprDecideOptions extends Omit<PreprQueryOptions, 'variants'> {
      * none, e.g. on pages with only A/B tests or no personalization.
      */
     from?: unknown;
-    /**
-     * @internal Ask only about the first personalizable list on each path,
-     * without `from`: what middleware needs for groups at the top of a stack.
-     */
-    topLevelOnly?: boolean;
 }
 interface PreprQueryResult<TResult> {
     data: TResult;
@@ -236,6 +198,39 @@ interface PreprQueryResult<TResult> {
     personalized: boolean;
 }
 
+/**
+ * The schema facts the query rewrites need, from `loadPreprSchema`. Pass it
+ * along; its shape is not part of the public API.
+ */
+type PreprSchema = PreprSchemaInfo;
+/**
+ * Your query, asking for every personalization and A/B variant: what
+ * `query(..., { variants: true })` sends, as a string for your own GraphQL
+ * client. The result is the same for every visitor, so cache it like any
+ * other content query, and render it with `resolveVariants` or `PreprStack`.
+ *
+ * A query without personalizable fields comes back unchanged (minified).
+ */
+declare function toVariantsQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema): string;
+/**
+ * The per-visitor decision query for the same query: send it with the
+ * visitor's Prepr headers, never cached, and pass the response's `data` to
+ * `decisionsFrom`.
+ *
+ * Pass the variants result as `from` whenever you have it: the query then
+ * asks only about the lists that hold segment groups on this page, which is
+ * a few hundred bytes instead of the whole page and markedly faster for a
+ * visitor Prepr has not seen before. Without `from` it asks about every
+ * personalizable list. `topLevelOnly` stops at the first personalizable list
+ * on each path, for middleware that decides only the top of a stack.
+ *
+ * Null when there is nothing to decide: send no request then.
+ */
+declare function toDecisionQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema, options?: {
+    from?: unknown;
+    topLevelOnly?: boolean;
+}): string | null;
+
 /**
  * Query options for frameworks without an implicit request scope.
  * `personalize: true` requires the request `event`; the compiler enforces it.

package/dist/sveltekit/graphql.d.ts

@@ -95,39 +95,6 @@ interface PreprVariantProps {
  */
 declare function preprVariantProps(item: unknown): PreprVariantProps;
 
-/**
- * The schema facts the query rewrites need, from `loadPreprSchema`. Pass it
- * along; its shape is not part of the public API.
- */
-type PreprSchema = PreprSchemaInfo;
-/**
- * Your query, asking for every personalization and A/B variant: what
- * `query(..., { variants: true })` sends, as a string for your own GraphQL
- * client. The result is the same for every visitor, so cache it like any
- * other content query, and render it with `resolveVariants` or `PreprStack`.
- *
- * A query without personalizable fields comes back unchanged (minified).
- */
-declare function toVariantsQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema): string;
-/**
- * The per-visitor decision query for the same query: send it with the
- * visitor's Prepr headers, never cached, and pass the response's `data` to
- * `decisionsFrom`.
- *
- * Pass the variants result as `from` whenever you have it: the query then
- * asks only about the lists that hold segment groups on this page, which is
- * a few hundred bytes instead of the whole page and markedly faster for a
- * visitor Prepr has not seen before. Without `from` it asks about every
- * personalizable list. `topLevelOnly` stops at the first personalizable list
- * on each path, for middleware that decides only the top of a stack.
- *
- * Null when there is nothing to decide: send no request then.
- */
-declare function toDecisionQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema, options?: {
-    from?: unknown;
-    topLevelOnly?: boolean;
-}): string | null;
-
 /**
  * A GraphQL document accepted by `query`: a plain string, graphql-codegen's
  * `TypedDocumentString` (`documentMode: 'string'`), or any `DocumentNode`,
@@ -221,11 +188,6 @@ interface PreprDecideOptions extends Omit<PreprQueryOptions, 'variants'> {
      * none, e.g. on pages with only A/B tests or no personalization.
      */
     from?: unknown;
-    /**
-     * @internal Ask only about the first personalizable list on each path,
-     * without `from`: what middleware needs for groups at the top of a stack.
-     */
-    topLevelOnly?: boolean;
 }
 interface PreprQueryResult<TResult> {
     data: TResult;
@@ -236,6 +198,39 @@ interface PreprQueryResult<TResult> {
     personalized: boolean;
 }
 
+/**
+ * The schema facts the query rewrites need, from `loadPreprSchema`. Pass it
+ * along; its shape is not part of the public API.
+ */
+type PreprSchema = PreprSchemaInfo;
+/**
+ * Your query, asking for every personalization and A/B variant: what
+ * `query(..., { variants: true })` sends, as a string for your own GraphQL
+ * client. The result is the same for every visitor, so cache it like any
+ * other content query, and render it with `resolveVariants` or `PreprStack`.
+ *
+ * A query without personalizable fields comes back unchanged (minified).
+ */
+declare function toVariantsQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema): string;
+/**
+ * The per-visitor decision query for the same query: send it with the
+ * visitor's Prepr headers, never cached, and pass the response's `data` to
+ * `decisionsFrom`.
+ *
+ * Pass the variants result as `from` whenever you have it: the query then
+ * asks only about the lists that hold segment groups on this page, which is
+ * a few hundred bytes instead of the whole page and markedly faster for a
+ * visitor Prepr has not seen before. Without `from` it asks about every
+ * personalizable list. `topLevelOnly` stops at the first personalizable list
+ * on each path, for middleware that decides only the top of a stack.
+ *
+ * Null when there is nothing to decide: send no request then.
+ */
+declare function toDecisionQuery(document: PreprDocument<unknown, unknown> | string, schema: PreprSchema, options?: {
+    from?: unknown;
+    topLevelOnly?: boolean;
+}): string | null;
+
 /**
  * Query options for frameworks without an implicit request scope.
  * `personalize: true` requires the request `event`; the compiler enforces it.

package/dist/sveltekit/graphql.js

@@ -4,7 +4,7 @@ import {
   getPreprHeadersFromLocals,
   isPersonalizedResponse,
   validatePreprToken
-} from "./chunk-5K7HWMIF.js";
+} from "./chunk-S7S276V7.js";
 
 // src/core/variants/constants.ts
 var PREPR_CONTEXT_ALIAS = "_preprContext";
@@ -93,7 +93,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
@@ -103,13 +106,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;
@@ -183,20 +192,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) {
@@ -770,6 +817,7 @@ function createVaryProbe(run, options) {
 }
 
 // src/core/graphql/client.ts
+var clientSchemas = /* @__PURE__ */ new WeakMap();
 function isParseableUrl(url) {
   try {
     new URL(url);
@@ -806,7 +854,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);
@@ -818,10 +866,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();
@@ -829,9 +877,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();
@@ -845,6 +891,8 @@ function createPreprClient(options) {
       (vary) => vary === null || SEGMENTS_VARY.test(vary)
     )
   };
+  clientSchemas.set(client, loadSchema);
+  return client;
 }
 
 // src/core/graphql/event-client.ts

package/dist/sveltekit/index.cjs

@@ -36,7 +36,7 @@ __export(sveltekit_exports, {
 module.exports = __toCommonJS(sveltekit_exports);
 
 // src/version.ts
-var VERSION = "0.6.0-alpha.6";
+var VERSION = "0.6.0-alpha.7";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";

package/dist/sveltekit/index.js

@@ -11,7 +11,7 @@ import {
   isPersonalizedResponse,
   preprHandle,
   validatePreprToken
-} from "./chunk-5K7HWMIF.js";
+} from "./chunk-S7S276V7.js";
 
 // src/sveltekit/server.ts
 function getPreprUUID(headers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preprio/toolkit",
-  "version": "0.6.0-alpha.6",
+  "version": "0.6.0-alpha.7",
   "description": "Prepr personalization, A/B testing and preview toolkit for React, Next.js, Nuxt, Astro, SvelteKit and Express",
   "license": "Apache-2.0",
   "author": "Prepr B.V. (https://prepr.io)",