@amplifyup/sdk 0.1.42 → 0.1.44

package/dist/react.js

@@ -411,6 +411,205 @@ function isComposerPreview() {
   return false;
 }
 
+// src/page-context.ts
+function extractRouteParams(pattern, url) {
+  const patternParts = String(pattern || "").split("/").filter(Boolean);
+  const urlParts = String(url || "").split("?")[0].split("#")[0].split("/").filter(Boolean);
+  if (patternParts.length !== urlParts.length) return {};
+  const params = {};
+  for (let i = 0; i < patternParts.length; i++) {
+    const part = patternParts[i];
+    if (part.startsWith(":")) {
+      params[part.slice(1)] = urlParts[i];
+    }
+  }
+  return params;
+}
+var defaultLog = {
+  warn: (...args) => {
+    if (typeof console !== "undefined") console.warn(...args);
+  }
+};
+function coerceField(def, raw, log) {
+  if (raw == null) return void 0;
+  if (def.multiValue) {
+    const list = Array.isArray(raw) ? raw : [raw];
+    const out = [];
+    for (const item of list) {
+      const coerced = coerceScalar(def, item, log);
+      if (coerced !== void 0) out.push(coerced);
+    }
+    return out;
+  }
+  return coerceScalar(def, raw, log);
+}
+function coerceScalar(def, raw, log) {
+  switch (def.dataType) {
+    case "string":
+      if (typeof raw === "string") return raw;
+      if (typeof raw === "number" || typeof raw === "boolean") return String(raw);
+      log.warn(`AmplifyUp: dropped field "${def.key}" (expected string)`);
+      return void 0;
+    case "number": {
+      if (typeof raw === "number" && Number.isFinite(raw)) return raw;
+      if (typeof raw === "string" && raw.trim() !== "" && Number.isFinite(Number(raw))) {
+        return Number(raw);
+      }
+      log.warn(`AmplifyUp: dropped field "${def.key}" (expected number)`);
+      return void 0;
+    }
+    case "boolean": {
+      if (typeof raw === "boolean") return raw;
+      if (raw === "true") return true;
+      if (raw === "false") return false;
+      log.warn(`AmplifyUp: dropped field "${def.key}" (expected boolean)`);
+      return void 0;
+    }
+    case "date": {
+      if (typeof raw === "string" && !Number.isNaN(Date.parse(raw))) return raw;
+      log.warn(`AmplifyUp: dropped field "${def.key}" (expected date)`);
+      return void 0;
+    }
+    default:
+      return void 0;
+  }
+}
+function applyPageContext(input, opts) {
+  const log = opts.log || defaultLog;
+  const key = String(input.key || "").trim();
+  if (!key || !input.resourceType) {
+    log.warn("AmplifyUp: pageContext needs resourceType and key");
+    return null;
+  }
+  const slot = opts.pageData?.slots?.[0];
+  if (slot && slot.type && slot.type !== input.resourceType) {
+    log.warn(
+      `AmplifyUp: pageContext resourceType "${input.resourceType}" does not match page slot "${slot.type}"`
+    );
+    return null;
+  }
+  const fieldDefs = slot?.fields || [];
+  const defByKey = new Map(fieldDefs.map((f) => [f.key, f]));
+  const rawFields = input.fields && typeof input.fields === "object" ? input.fields : {};
+  const fields = {};
+  if (fieldDefs.length === 0) {
+    Object.assign(fields, rawFields);
+  } else {
+    for (const [k, v] of Object.entries(rawFields)) {
+      const def = defByKey.get(k);
+      if (!def) {
+        log.warn(`AmplifyUp: unknown resource field "${k}" dropped`);
+        continue;
+      }
+      const coerced = coerceField(def, v, log);
+      if (coerced !== void 0) fields[k] = coerced;
+    }
+  }
+  const params = { ...opts.routeParams || {} };
+  const mapping = slot?.urlParamMapping;
+  let resourceKey = key;
+  if (mapping) {
+    const fromUrl = params[mapping.param];
+    const fromField = fields[mapping.field];
+    if (fromUrl) resourceKey = String(fromUrl);
+    if (fromUrl && fromField != null && String(fromField) !== String(fromUrl)) {
+      log.warn(
+        `AmplifyUp: resource key mismatch \u2014 URL :${mapping.param} is "${fromUrl}" but ${mapping.field} is "${String(fromField)}". Using the URL param.`
+      );
+    }
+  }
+  const pageFields = {};
+  for (const pf of opts.pageData?.pageFields || []) {
+    if (pf.source === "static") {
+      if (pf.value !== void 0) pageFields[pf.key] = pf.value;
+      continue;
+    }
+    if (pf.source === "mapped" && pf.slot && pf.field) {
+      pageFields[pf.key] = fields[pf.field];
+    }
+  }
+  return {
+    resource: {
+      type: input.resourceType,
+      key: resourceKey,
+      params,
+      fields
+    },
+    page: { fields: pageFields },
+    pageRoute: opts.pageRoute || ""
+  };
+}
+function staticPageFieldsFromSnapshot(pageData) {
+  const pageFields = {};
+  for (const pf of pageData?.pageFields || []) {
+    if (pf.source === "static" && pf.value !== void 0) {
+      pageFields[pf.key] = pf.value;
+    }
+  }
+  return pageFields;
+}
+function attachStaticPageContext(pageData, pageRoute) {
+  if (!pageData) return null;
+  const fields = staticPageFieldsFromSnapshot(pageData);
+  const hasStatic = Object.keys(fields).length > 0;
+  const hasRoute = !!pageRoute;
+  if (!hasStatic && !hasRoute) return null;
+  return {
+    page: { fields },
+    pageRoute: pageRoute || ""
+  };
+}
+function mergeEventContext(properties, attached) {
+  if (!attached) return properties;
+  return {
+    ...properties,
+    ...attached.resource ? { resource: attached.resource } : {},
+    page: attached.page,
+    ...attached.pageRoute ? { pageRoute: attached.pageRoute } : {}
+  };
+}
+var PAGE_SLOT_MARKER = "__amplifyupPageSlot";
+function isPageSlotSentinel(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && typeof value[PAGE_SLOT_MARKER] === "string";
+}
+function getByDotPath(source, path) {
+  if (!path) return source;
+  const parts = path.split(".").filter(Boolean);
+  let cur = source;
+  for (const part of parts) {
+    if (cur == null || typeof cur !== "object" || Array.isArray(cur)) {
+      return void 0;
+    }
+    cur = cur[part];
+  }
+  return cur;
+}
+function hydratePageSlotValue(value, fields) {
+  if (!isPageSlotSentinel(value)) return value;
+  if (!fields) return null;
+  if (value.path) return getByDotPath(fields, value.path) ?? null;
+  return fields;
+}
+function hydratePageSlotProps(props, fields) {
+  const source = props && typeof props === "object" ? props : {};
+  const out = { ...source };
+  for (const [key, val] of Object.entries(out)) {
+    if (isPageSlotSentinel(val)) {
+      out[key] = hydratePageSlotValue(val, fields);
+    }
+  }
+  return out;
+}
+
+// src/page-slot-runtime.ts
+var pageSlotFields = null;
+function setPageSlotFields(fields) {
+  pageSlotFields = fields && typeof fields === "object" ? fields : null;
+}
+function getPageSlotFields() {
+  return pageSlotFields;
+}
+
 // src/edge/normalizeRoute.ts
 function normalizeRoute(route) {
   let path = String(route || "").trim();
@@ -530,7 +729,8 @@ function mapResolvedToPageConfig(payload) {
       // Stash edge meta for diagnostics (not visitor-facing)
       description: payload.meta?.degraded ? "degraded" : void 0
     },
-    ...payload.eventTracking && payload.eventTracking.length > 0 ? { eventTracking: payload.eventTracking } : {}
+    ...payload.eventTracking && payload.eventTracking.length > 0 ? { eventTracking: payload.eventTracking } : {},
+    ...payload.pageData ? { pageData: payload.pageData } : {}
   };
 }
 function collectDegraded(payload) {
@@ -820,6 +1020,11 @@ var AmplifyUpSDK = class {
     this.pageEngagementActive = false;
     /** Path of the last page() / routeChange — avoids duplicate SPA fires. */
     this.lastTrackedPath = null;
+    this.pendingPageContext = null;
+    this.attachedPageContext = null;
+    this.resolvedPageData = null;
+    this.resolvedPageRoute = "";
+    this.resolvedRouteParams = {};
     this.historyHooksInstalled = false;
     this.pageEngagementState = {
       reached: /* @__PURE__ */ new Set(),
@@ -982,8 +1187,13 @@ var AmplifyUpSDK = class {
       // Enable debug by default
       target: this.target,
       dev: config.dev,
-      ...config.siteId ? { siteId: config.siteId } : {}
+      ...config.siteId ? { siteId: config.siteId } : {},
+      ...config.pageContext ? { pageContext: config.pageContext } : {}
     };
+    if (config.pageContext) {
+      this.pendingPageContext = config.pageContext;
+      this.recomputeAttachedContext();
+    }
     try {
       const adapterConfig = {
         ...this.config,
@@ -1340,6 +1550,44 @@ var AmplifyUpSDK = class {
     this.componentViewObservers.forEach((obs) => obs.disconnect());
     this.componentViewObservers = [];
   }
+  /**
+   * Set resource context for this page. Prefer passing `pageContext` on
+   * AmplifyUpProvider / init — required for components using From page.
+   * Late calls still attach to subsequent events (not a second page view).
+   */
+  setPageContext(input) {
+    this.pendingPageContext = input;
+    this.recomputeAttachedContext();
+  }
+  /**
+   * Apply published pageData (from /v1/resolve) so field validation and
+   * mapped page fields can run.
+   */
+  applyResolvedPageData(pageData, pageRoute, routeParams) {
+    this.resolvedPageData = pageData || null;
+    if (pageRoute) this.resolvedPageRoute = pageRoute;
+    if (routeParams) this.resolvedRouteParams = routeParams;
+    this.recomputeAttachedContext();
+  }
+  recomputeAttachedContext() {
+    if (!this.pendingPageContext) {
+      this.attachedPageContext = attachStaticPageContext(
+        this.resolvedPageData,
+        this.resolvedPageRoute
+      );
+      setPageSlotFields(null);
+      return;
+    }
+    this.attachedPageContext = applyPageContext(this.pendingPageContext, {
+      pageData: this.resolvedPageData,
+      routeParams: this.resolvedRouteParams,
+      pageRoute: this.resolvedPageRoute
+    });
+    setPageSlotFields(this.attachedPageContext?.resource?.fields || null);
+  }
+  getAttachedPageContext() {
+    return this.attachedPageContext;
+  }
   /**
    * Track a page view
    */
@@ -1361,7 +1609,7 @@ var AmplifyUpSDK = class {
       sessionId,
       trackingId: this.config?.trackingId,
       // Timestamp is included in event payload
-      ...properties
+      ...mergeEventContext(properties || {}, this.attachedPageContext)
     };
     this.adapter.page(pageProperties);
     this.lastTrackedPath = url;
@@ -1385,7 +1633,7 @@ var AmplifyUpSDK = class {
       url: typeof window !== "undefined" ? window.location.href : void 0,
       path: properties?.path || (typeof window !== "undefined" ? window.location.pathname : void 0),
       // Timestamp is included in event payload
-      ...properties
+      ...mergeEventContext(properties || {}, this.attachedPageContext)
     };
     if (!trackProperties.path && typeof window !== "undefined") {
       trackProperties.path = window.location.pathname;
@@ -1710,8 +1958,15 @@ Available Console Commands:
     });
     if (preview) {
       params.set("preview", "true");
-      if (typeof window !== "undefined" && isWorkingContentRequest(new URLSearchParams(window.location.search))) {
-        params.set("working", "true");
+      if (typeof window !== "undefined") {
+        const pageSearch = new URLSearchParams(window.location.search);
+        if (isWorkingContentRequest(pageSearch)) {
+          params.set("working", "true");
+        }
+        const zoneId = pageSearch.get("zoneId");
+        const compositionId = pageSearch.get("compositionId");
+        if (zoneId) params.set("zoneId", zoneId);
+        if (compositionId) params.set("compositionId", compositionId);
       }
     }
     if (isOnOrchestratorOrigin) {
@@ -3131,7 +3386,10 @@ function ComponentContextProvider({
   layoutNodeId,
   componentId
 }) {
-  const liveProps = useLiveComposerProps(layoutNodeId, props || {});
+  const liveProps = useLiveComposerProps(
+    layoutNodeId,
+    hydratePageSlotProps(props || {}, getPageSlotFields())
+  );
   return /* @__PURE__ */ jsxRuntime.jsx(
     ComponentContext.Provider,
     {
@@ -4285,6 +4543,17 @@ async function fetchPageConfigServer(route, trackingId, preview = false, options
     });
     if (isPreview) params.set("preview", "true");
     if (workingFlag) params.set("working", "true");
+    if (options?.searchParams) {
+      const sp = options.searchParams instanceof URLSearchParams ? options.searchParams : new URLSearchParams(
+        Object.entries(options.searchParams).flatMap(
+          ([k, v]) => v == null ? [] : Array.isArray(v) ? v.map((item) => [k, item]) : [[k, v]]
+        )
+      );
+      const zoneId = sp.get("zoneId");
+      const compositionId = sp.get("compositionId");
+      if (zoneId) params.set("zoneId", zoneId);
+      if (compositionId) params.set("compositionId", compositionId);
+    }
     const url = `${orchestratorUrl}/api/layout/provider?${params.toString()}`;
     try {
       const res = await fetch(url, {
@@ -4323,7 +4592,11 @@ if (typeof window !== "undefined") {
   }
 }
 var AmplifyUpContext = React.createContext(null);
-function AmplifyUpProvider({ children, config }) {
+function AmplifyUpProvider({
+  children,
+  config,
+  pageContext
+}) {
   const [initialized, setInitialized] = React.useState(false);
   const [pageConfig, setPageConfig] = React.useState(null);
   const [loading, setLoading] = React.useState(true);
@@ -4382,7 +4655,10 @@ function AmplifyUpProvider({ children, config }) {
   React.useEffect(() => {
     let cancelled = false;
     const sdk = getSDK();
-    sdk.init(config).then(() => {
+    sdk.init({
+      ...config,
+      ...pageContext ? { pageContext } : {}
+    }).then(() => {
       if (!cancelled) {
         setInitialized(true);
       }
@@ -4395,7 +4671,11 @@ function AmplifyUpProvider({ children, config }) {
     return () => {
       cancelled = true;
     };
-  }, [config.trackingId, config.target, config.debug, config.dev, config.siteId]);
+  }, [config.trackingId, config.target, config.debug, config.dev, config.siteId, pageContext]);
+  React.useEffect(() => {
+    if (!initialized || !pageContext) return;
+    getSDK().setPageContext(pageContext);
+  }, [initialized, pageContext]);
   React.useEffect(() => {
     if (!initialized) return;
     let cancelled = false;
@@ -4470,6 +4750,11 @@ function AmplifyUpProvider({ children, config }) {
           });
         } else {
           setPageConfig(result.pageConfig);
+          sdk.applyResolvedPageData(
+            result.pageConfig.pageData || null,
+            result.pageConfig.route,
+            extractRouteParams(result.pageConfig.route, actualRoute)
+          );
         }
       } catch (err) {
         if (cancelled) return;