@amplifyup/sdk 0.1.73 → 0.1.75

package/dist/react.mjs

@@ -837,6 +837,7 @@ function applyPageContext(input, opts) {
   }
   const pageFields = {};
   for (const pf of opts.pageData?.pageFields || []) {
+    if (pf.dataType === "taxonomy") continue;
     if (pf.source === "static") {
       if (pf.value !== void 0) pageFields[pf.key] = pf.value;
       continue;
@@ -859,6 +860,7 @@ function applyPageContext(input, opts) {
 function staticPageFieldsFromSnapshot(pageData) {
   const pageFields = {};
   for (const pf of pageData?.pageFields || []) {
+    if (pf.dataType === "taxonomy") continue;
     if (pf.source === "static" && pf.value !== void 0) {
       pageFields[pf.key] = pf.value;
     }
@@ -876,13 +878,19 @@ function attachStaticPageContext(pageData, pageRoute) {
     pageRoute: pageRoute || ""
   };
 }
+function withPageTaxonomies(properties, taxonomies) {
+  if (!taxonomies || Object.keys(taxonomies).length === 0) return properties;
+  const page = properties.page && typeof properties.page === "object" && !Array.isArray(properties.page) ? properties.page : { fields: {} };
+  return { ...properties, page: { ...page, taxonomies } };
+}
 function mergeEventContext(properties, attached) {
   if (!attached) return properties;
   return {
     ...properties,
     ...attached.resource ? { resource: attached.resource } : {},
     page: attached.page,
-    ...attached.pageRoute ? { pageRoute: attached.pageRoute } : {}
+    ...attached.pageRoute ? { pageRoute: attached.pageRoute } : {},
+    ...attached.pageResource ? { pageResource: attached.pageResource } : {}
   };
 }
 var PAGE_RESOURCE_MARKER = "__amplifyupPageResource";
@@ -944,6 +952,27 @@ function hydratePageResourceProps(props, fields) {
   return out;
 }
 
+// src/edge/normalizeRoute.ts
+function normalizeRoute(route) {
+  let path = String(route || "").trim();
+  if (!path) return "/";
+  try {
+    if (/^https?:\/\//i.test(path)) {
+      path = new URL(path).pathname;
+    }
+  } catch {
+  }
+  const q = path.indexOf("?");
+  if (q >= 0) path = path.slice(0, q);
+  const h = path.indexOf("#");
+  if (h >= 0) path = path.slice(0, h);
+  if (!path.startsWith("/")) path = `/${path}`;
+  if (path.length > 1 && path.endsWith("/")) {
+    path = path.replace(/\/+$/, "");
+  }
+  return path || "/";
+}
+
 // src/page-resource-runtime.ts
 var pageResourceFields = null;
 function setPageResourceFields(fields) {
@@ -1041,27 +1070,6 @@ function previewLayoutReady(opts) {
   return true;
 }
 
-// src/edge/normalizeRoute.ts
-function normalizeRoute(route) {
-  let path = String(route || "").trim();
-  if (!path) return "/";
-  try {
-    if (/^https?:\/\//i.test(path)) {
-      path = new URL(path).pathname;
-    }
-  } catch {
-  }
-  const q = path.indexOf("?");
-  if (q >= 0) path = path.slice(0, q);
-  const h = path.indexOf("#");
-  if (h >= 0) path = path.slice(0, h);
-  if (!path.startsWith("/")) path = `/${path}`;
-  if (path.length > 1 && path.endsWith("/")) {
-    path = path.replace(/\/+$/, "");
-  }
-  return path || "/";
-}
-
 // src/edge/variantKeys.ts
 function serializeVariantKeys(keys) {
   if (!keys) return "";
@@ -1182,7 +1190,9 @@ function mapResolvedToPageConfig(payload) {
       description: payload.meta?.degraded ? "degraded" : void 0
     },
     ...payload.eventTracking && payload.eventTracking.length > 0 ? { eventTracking: payload.eventTracking } : {},
-    ...payload.pageData ? { pageData: payload.pageData } : {}
+    ...payload.pageData ? { pageData: payload.pageData } : {},
+    ...payload.pageResources ? { pageResources: payload.pageResources } : {},
+    ...payload.pageTaxonomies ? { pageTaxonomies: payload.pageTaxonomies } : {}
   };
 }
 function collectDegraded(payload) {
@@ -1414,6 +1424,7 @@ function searchSpec(pagination, field, term) {
 }
 
 // src/index.ts
+var PAGE_VIEW_HOLD_MS = 1500;
 var DWELL_ACTIVITY_IDLE_MS = 2 * 60 * 1e3;
 var DWELL_POLL_MS = 5e3;
 function readPreviewQueryOverrides() {
@@ -1484,8 +1495,15 @@ var AmplifyUpSDK = class {
     this.pendingPageContext = null;
     this.attachedPageContext = null;
     this.resolvedPageData = null;
+    this.resolvedPageResource = null;
     this.resolvedPageRoute = "";
     this.resolvedRouteParams = {};
+    /** Path whose delivery response is in flight; page_view for it is held. */
+    this.pendingResolvePath = null;
+    this.heldPageView = null;
+    this.resolvedPageTaxonomies = null;
+    /** Path the taxonomies above were resolved for. */
+    this.resolvedTaxonomiesPath = null;
     this.historyHooksInstalled = false;
     this.pageEngagementState = {
       reached: /* @__PURE__ */ new Set(),
@@ -2016,31 +2034,65 @@ var AmplifyUpSDK = class {
    * Apply published pageData (from /v1/resolve) so field validation and
    * mapped page fields can run.
    */
-  applyResolvedPageData(pageData, pageRoute, routeParams) {
+  applyResolvedPageData(pageData, pageRoute, routeParams, pageResources, pageTaxonomies) {
     this.resolvedPageData = pageData || null;
+    this.resolvedPageTaxonomies = pageTaxonomies || null;
+    this.resolvedTaxonomiesPath = this.pendingResolvePath;
     if (pageRoute) this.resolvedPageRoute = pageRoute;
     if (routeParams) this.resolvedRouteParams = routeParams;
+    const firstResourceName = pageData?.resources?.[0]?.name;
+    const resolvedForPage = (firstResourceName ? pageResources?.[firstResourceName] : void 0) || (pageResources ? Object.values(pageResources)[0] : void 0);
+    this.resolvedPageResource = resolvedForPage || null;
     this.recomputeAttachedContext();
   }
   recomputeAttachedContext() {
     if (!this.pendingPageContext) {
-      this.attachedPageContext = attachStaticPageContext(
-        this.resolvedPageData,
-        this.resolvedPageRoute
+      this.attachedPageContext = this.withPageResource(
+        attachStaticPageContext(this.resolvedPageData, this.resolvedPageRoute)
       );
       setPageResourceFields(null);
       return;
     }
-    this.attachedPageContext = applyPageContext(this.pendingPageContext, {
-      pageData: this.resolvedPageData,
-      routeParams: this.resolvedRouteParams,
-      pageRoute: this.resolvedPageRoute
-    });
+    this.attachedPageContext = this.withPageResource(
+      applyPageContext(this.pendingPageContext, {
+        pageData: this.resolvedPageData,
+        routeParams: this.resolvedRouteParams,
+        pageRoute: this.resolvedPageRoute
+      })
+    );
     setPageResourceFields(this.attachedPageContext?.resource?.fields || null);
   }
+  /** Stamp the resolved entry onto the context so events carry it. */
+  withPageResource(context) {
+    if (!context || !this.resolvedPageResource) return context;
+    const { entity, providerId, docId } = this.resolvedPageResource;
+    return { ...context, pageResource: { entity, providerId, docId } };
+  }
   getAttachedPageContext() {
     return this.attachedPageContext;
   }
+  /**
+   * The page's delivery response for `path` is on its way. A page_view for the
+   * same path waits for it (up to PAGE_VIEW_HOLD_MS) so it carries the page's
+   * taxonomies.
+   */
+  beginPageResolve(path) {
+    this.pendingResolvePath = normalizeRoute(path);
+    this.resolvedPageTaxonomies = null;
+    this.resolvedTaxonomiesPath = null;
+  }
+  endPageResolve(path) {
+    if (this.pendingResolvePath !== normalizeRoute(path)) return;
+    this.pendingResolvePath = null;
+    this.flushHeldPageView();
+  }
+  flushHeldPageView() {
+    const held = this.heldPageView;
+    if (!held) return;
+    clearTimeout(held.timer);
+    this.heldPageView = null;
+    this.sendPageView(held.url, held.properties);
+  }
   /**
    * Track a page view
    */
@@ -2051,6 +2103,21 @@ var AmplifyUpSDK = class {
     if (!this.isInitialized()) {
       return;
     }
+    this.lastTrackedPath = url;
+    if (this.pendingResolvePath && this.pendingResolvePath === normalizeRoute(url)) {
+      this.flushHeldPageView();
+      this.heldPageView = {
+        url,
+        properties,
+        timer: setTimeout(() => this.flushHeldPageView(), PAGE_VIEW_HOLD_MS)
+      };
+      return;
+    }
+    this.flushHeldPageView();
+    this.sendPageView(url, properties);
+  }
+  sendPageView(url, properties) {
+    const taxonomies = this.resolvedTaxonomiesPath && this.resolvedTaxonomiesPath === normalizeRoute(url) ? this.resolvedPageTaxonomies : null;
     const instanceId = getInstanceId();
     const sessionId = getSessionId();
     const pageProperties = {
@@ -2062,10 +2129,9 @@ var AmplifyUpSDK = class {
       sessionId,
       trackingId: this.config?.trackingId,
       // Timestamp is included in event payload
-      ...mergeEventContext(properties || {}, this.attachedPageContext)
+      ...withPageTaxonomies(mergeEventContext(properties || {}, this.attachedPageContext), taxonomies)
     };
     this.adapter.page(pageProperties);
-    this.lastTrackedPath = url;
   }
   /**
    * Track an event
@@ -5512,6 +5578,8 @@ function AmplifyUpProvider({
   useEffect(() => {
     let cancelled = false;
     const sdk = getSDK();
+    const heldRoute = isComposerPreview() || config.clientPersonalization !== false ? getActualRoute() : null;
+    if (heldRoute) sdk.beginPageResolve(heldRoute);
     const run = async () => {
       try {
         await sdk.init({
@@ -5590,7 +5658,9 @@ function AmplifyUpProvider({
           sdk.applyResolvedPageData(
             result.pageConfig.pageData || null,
             result.pageConfig.route,
-            extractRouteParams(result.pageConfig.route, actualRoute)
+            extractRouteParams(result.pageConfig.route, actualRoute),
+            result.pageConfig.pageResources || null,
+            result.pageConfig.pageTaxonomies || null
           );
         }
         setInitialized(true);
@@ -5614,6 +5684,7 @@ function AmplifyUpProvider({
         setSource(null);
         setMeta(null);
       } finally {
+        if (heldRoute) sdk.endPageResolve(heldRoute);
         if (!cancelled) setLoading(false);
       }
     };