@amplifyup/sdk 0.1.75 → 0.1.77

package/dist/react.d.mts

@@ -200,8 +200,10 @@ declare function slotStateFromEl(el: {
     getAttribute: (name: string) => string | null;
 } | null | undefined): SlotState | null;
 
-declare function ComposerProvider({ children, }: {
+declare function ComposerProvider({ children, enabled, }: {
     children: ReactNode;
+    /** When false, pass through any parent store without creating or wiring one. */
+    enabled?: boolean;
 }): react_jsx_runtime.JSX.Element;
 declare function MaybeComposerProvider({ enabled, layoutNodeId, children, }: {
     enabled: boolean;

package/dist/react.d.ts

@@ -200,8 +200,10 @@ declare function slotStateFromEl(el: {
     getAttribute: (name: string) => string | null;
 } | null | undefined): SlotState | null;
 
-declare function ComposerProvider({ children, }: {
+declare function ComposerProvider({ children, enabled, }: {
     children: ReactNode;
+    /** When false, pass through any parent store without creating or wiring one. */
+    enabled?: boolean;
 }): react_jsx_runtime.JSX.Element;
 declare function MaybeComposerProvider({ enabled, layoutNodeId, children, }: {
     enabled: boolean;

package/dist/react.js

@@ -17,7 +17,121 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
+// src/storage.ts
+var INSTANCE_ID_KEY = "amplifyup_instance_id";
+var USER_ID_KEY = "amplifyup_user_id";
+var SESSION_ID_KEY = "amplifyup_session_id";
+var SESSION_ACTIVITY_KEY = "amplifyup_session_activity";
+var VISITOR_FIRST_SEEN_KEY = "amplifyup_visitor_first_seen";
+var ANON_COOKIE_NAME = "amplifyup_anon_id";
+var SESSION_COOKIE_NAME = "amplifyup_session_id";
+var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
+function generateGuid() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID();
+  }
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
+function readCookie(name) {
+  if (typeof document === "undefined") return null;
+  const parts = document.cookie.split(";");
+  for (const part of parts) {
+    const idx = part.indexOf("=");
+    if (idx === -1) continue;
+    if (part.slice(0, idx).trim() !== name) continue;
+    const value = part.slice(idx + 1).trim();
+    try {
+      return value ? decodeURIComponent(value) : null;
+    } catch {
+      return value || null;
+    }
+  }
+  return null;
+}
+function writeCookie(name, value, maxAgeSeconds = 31536e3) {
+  if (typeof document === "undefined") return;
+  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAgeSeconds}; SameSite=Lax`;
+}
+function getInstanceId() {
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const fromCookie = readCookie(ANON_COOKIE_NAME);
+  const fromLs = localStorage.getItem(INSTANCE_ID_KEY);
+  const instanceId = fromLs || fromCookie || `browser_${generateGuid()}`;
+  if (fromLs !== instanceId) {
+    localStorage.setItem(INSTANCE_ID_KEY, instanceId);
+  }
+  if (fromCookie !== instanceId) {
+    writeCookie(ANON_COOKIE_NAME, instanceId);
+  }
+  return instanceId;
+}
+function getUserId() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return localStorage.getItem(USER_ID_KEY);
+}
+function getSessionId() {
+  if (typeof window === "undefined") {
+    return "";
+  }
+  const now = Date.now();
+  const lastActivity = Number(localStorage.getItem(SESSION_ACTIVITY_KEY) || 0);
+  const fromCookie = readCookie(SESSION_COOKIE_NAME);
+  const fromLs = localStorage.getItem(SESSION_ID_KEY);
+  let sessionId = fromLs || fromCookie || "";
+  if (!sessionId || lastActivity > 0 && now - lastActivity >= SESSION_IDLE_GAP_MS) {
+    sessionId = generateGuid();
+  }
+  localStorage.setItem(SESSION_ID_KEY, sessionId);
+  localStorage.setItem(SESSION_ACTIVITY_KEY, String(now));
+  writeCookie(SESSION_COOKIE_NAME, sessionId, Math.floor(SESSION_IDLE_GAP_MS / 1e3));
+  return sessionId;
+}
+function getVisitorFirstSeenAt() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  try {
+    const existing = localStorage.getItem(VISITOR_FIRST_SEEN_KEY);
+    if (existing) return existing;
+    const firstSeenAt = (/* @__PURE__ */ new Date()).toISOString();
+    localStorage.setItem(VISITOR_FIRST_SEEN_KEY, firstSeenAt);
+    return firstSeenAt;
+  } catch {
+    return null;
+  }
+}
+function setUserId(userId) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  localStorage.setItem(USER_ID_KEY, userId);
+}
+function clearIds() {
+  if (typeof window === "undefined") {
+    return;
+  }
+  localStorage.removeItem(INSTANCE_ID_KEY);
+  localStorage.removeItem(USER_ID_KEY);
+  localStorage.removeItem(SESSION_ID_KEY);
+  localStorage.removeItem(SESSION_ACTIVITY_KEY);
+  localStorage.removeItem(VISITOR_FIRST_SEEN_KEY);
+  document.cookie = `${ANON_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
+  document.cookie = `${SESSION_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
+}
+
 // src/adapters/aws.ts
+function visitorContext() {
+  const firstSeenAt = getVisitorFirstSeenAt();
+  return firstSeenAt ? { firstSeenAt } : void 0;
+}
 var AWSAdapter = class {
   constructor() {
     this.initialized = false;
@@ -57,7 +171,9 @@ var AWSAdapter = class {
       console.warn("AmplifyUp SDK: AWS configuration missing");
       return;
     }
-    const url = `${this.apiGatewayUrl}${endpoint}`;
+    const trackingId = eventData?.trackingId || this.config?.trackingId;
+    const query = trackingId ? `?tid=${encodeURIComponent(trackingId)}` : "";
+    const url = `${this.apiGatewayUrl}${endpoint}${query}`;
     try {
       const response = await fetch(url, {
         method: "POST",
@@ -119,7 +235,8 @@ var AWSAdapter = class {
         page: {
           path: properties.path || properties.url,
           referrer: properties.referrer
-        }
+        },
+        visitor: visitorContext()
       },
       timestamp: properties.timestamp || (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -157,7 +274,8 @@ var AWSAdapter = class {
         ...properties
       },
       context: {
-        url: properties.url || (typeof window !== "undefined" ? window.location.href : "")
+        url: properties.url || (typeof window !== "undefined" ? window.location.href : ""),
+        visitor: visitorContext()
       },
       timestamp: properties.timestamp || (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -213,100 +331,6 @@ var AWSAdapter = class {
   }
 };
 
-// src/storage.ts
-var INSTANCE_ID_KEY = "amplifyup_instance_id";
-var USER_ID_KEY = "amplifyup_user_id";
-var SESSION_ID_KEY = "amplifyup_session_id";
-var SESSION_ACTIVITY_KEY = "amplifyup_session_activity";
-var ANON_COOKIE_NAME = "amplifyup_anon_id";
-var SESSION_COOKIE_NAME = "amplifyup_session_id";
-var SESSION_IDLE_GAP_MS = 30 * 60 * 1e3;
-function generateGuid() {
-  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-    return crypto.randomUUID();
-  }
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = Math.random() * 16 | 0;
-    const v = c === "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-}
-function readCookie(name) {
-  if (typeof document === "undefined") return null;
-  const parts = document.cookie.split(";");
-  for (const part of parts) {
-    const idx = part.indexOf("=");
-    if (idx === -1) continue;
-    if (part.slice(0, idx).trim() !== name) continue;
-    const value = part.slice(idx + 1).trim();
-    try {
-      return value ? decodeURIComponent(value) : null;
-    } catch {
-      return value || null;
-    }
-  }
-  return null;
-}
-function writeCookie(name, value, maxAgeSeconds = 31536e3) {
-  if (typeof document === "undefined") return;
-  document.cookie = `${name}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAgeSeconds}; SameSite=Lax`;
-}
-function getInstanceId() {
-  if (typeof window === "undefined") {
-    return "";
-  }
-  const fromCookie = readCookie(ANON_COOKIE_NAME);
-  const fromLs = localStorage.getItem(INSTANCE_ID_KEY);
-  const instanceId = fromLs || fromCookie || `browser_${generateGuid()}`;
-  if (fromLs !== instanceId) {
-    localStorage.setItem(INSTANCE_ID_KEY, instanceId);
-  }
-  if (fromCookie !== instanceId) {
-    writeCookie(ANON_COOKIE_NAME, instanceId);
-  }
-  return instanceId;
-}
-function getUserId() {
-  if (typeof window === "undefined") {
-    return null;
-  }
-  return localStorage.getItem(USER_ID_KEY);
-}
-function getSessionId() {
-  if (typeof window === "undefined") {
-    return "";
-  }
-  const now = Date.now();
-  const lastActivity = Number(localStorage.getItem(SESSION_ACTIVITY_KEY) || 0);
-  const fromCookie = readCookie(SESSION_COOKIE_NAME);
-  const fromLs = localStorage.getItem(SESSION_ID_KEY);
-  let sessionId = fromLs || fromCookie || "";
-  if (!sessionId || lastActivity > 0 && now - lastActivity >= SESSION_IDLE_GAP_MS) {
-    sessionId = generateGuid();
-  }
-  localStorage.setItem(SESSION_ID_KEY, sessionId);
-  localStorage.setItem(SESSION_ACTIVITY_KEY, String(now));
-  writeCookie(SESSION_COOKIE_NAME, sessionId, Math.floor(SESSION_IDLE_GAP_MS / 1e3));
-  return sessionId;
-}
-function setUserId(userId) {
-  if (typeof window === "undefined") {
-    return;
-  }
-  localStorage.setItem(USER_ID_KEY, userId);
-}
-function clearIds() {
-  if (typeof window === "undefined") {
-    return;
-  }
-  localStorage.removeItem(INSTANCE_ID_KEY);
-  localStorage.removeItem(USER_ID_KEY);
-  localStorage.removeItem(SESSION_ID_KEY);
-  localStorage.removeItem(SESSION_ACTIVITY_KEY);
-  document.cookie = `${ANON_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
-  document.cookie = `${SESSION_COOKIE_NAME}=; Path=/; Max-Age=0; SameSite=Lax`;
-}
-
 // src/targets.ts
 var AWS_DEV_API = "https://api-dev.amplifyup.ai";
 var AWS_PROD_API = "https://api.amplifyup.ai";
@@ -1071,9 +1095,8 @@ function dedupeLayoutProviderFetch(key, fetchFn) {
   return pending;
 }
 function previewLayoutReady(opts) {
-  if (opts.hasClientLayout) return true;
-  if (opts.clientLoading) return false;
-  return true;
+  if (opts.hasClientLayout || opts.hasServerLayout) return true;
+  return !opts.clientLoading;
 }
 
 // src/edge/variantKeys.ts
@@ -3992,14 +4015,16 @@ function applyComposerPatch(store, name, value, ref, layoutNodeId) {
   store.set(composerStoreKey(name, ref, layoutNodeId), value);
 }
 function ComposerProvider({
-  children
+  children,
+  enabled = true
 }) {
   const existing = React3.useContext(ComposerStoreContext);
   const storeRef = React3.useRef(null);
   if (!storeRef.current) storeRef.current = new ComposerFieldStore();
-  const store = existing || storeRef.current;
+  const ownsStore = !existing && enabled;
+  const store = existing || (enabled ? storeRef.current : null);
   React3.useEffect(() => {
-    if (existing) return;
+    if (!ownsStore || !store) return;
     const applyField = (fieldName, value, nodeId, ref) => {
       if (!fieldName || typeof fieldName !== "string") return;
       const fieldRef = isFieldRef(ref) ? ref : void 0;
@@ -4057,8 +4082,7 @@ function ComposerProvider({
       window.removeEventListener("amplifyup:props-patch", onPropsPatch);
       window.removeEventListener("message", onMessage);
     };
-  }, [existing, store]);
-  if (existing) return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
+  }, [ownsStore, store]);
   return /* @__PURE__ */ jsxRuntime.jsx(ComposerStoreContext.Provider, { value: store, children });
 }
 function useComposerFieldValue(name, fallback, ref) {
@@ -4085,9 +4109,7 @@ function MaybeComposerProvider({
   layoutNodeId,
   children
 }) {
-  const content = React3.useMemo(() => children, [children]);
-  if (!enabled) return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: content });
-  return /* @__PURE__ */ jsxRuntime.jsx(ComposerProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(ComposerNodeContext.Provider, { value: layoutNodeId, children }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(ComposerProvider, { enabled, children: /* @__PURE__ */ jsxRuntime.jsx(ComposerNodeContext.Provider, { value: enabled ? layoutNodeId : void 0, children }) });
 }
 function nodeRenderProps(node) {
   const settings = node.settings || {};
@@ -4520,17 +4542,16 @@ function AmplifyRendererInner({
   if (layoutTree.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx("main", { children: emptyComponent || /* @__PURE__ */ jsxRuntime.jsx("div", { className: "container mx-auto px-4 py-16", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-muted-foreground", children: "No content configured for this page." }) }) });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(ComposerProvider, { children: /* @__PURE__ */ jsxRuntime.jsx("main", { children: composerPreviewFlag ? /* @__PURE__ */ jsxRuntime.jsx(
-    "div",
+  return /* @__PURE__ */ jsxRuntime.jsx(ComposerProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(
+    "main",
     {
-      "data-slot-id": "main",
-      "data-amplifyup-slot": "main",
-      "data-slot-source": "page",
-      "data-slot-state": layoutTree.length === 0 ? "empty" : "filled",
-      "data-slot-empty": layoutTree.length === 0 ? "true" : void 0,
+      "data-slot-id": composerPreviewFlag ? "main" : void 0,
+      "data-amplifyup-slot": composerPreviewFlag ? "main" : void 0,
+      "data-slot-source": composerPreviewFlag ? "page" : void 0,
+      "data-slot-state": composerPreviewFlag ? "filled" : void 0,
       children: layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx(React3.Fragment, { children: renderNode(node) }, node.id))
     }
-  ) : layoutTree.map((node) => /* @__PURE__ */ jsxRuntime.jsx(React3.Fragment, { children: renderNode(node) }, node.id)) }) });
+  ) });
 }
 var AmplifyRenderer = React3.memo(AmplifyRendererInner);
 function AddComponentIcon({ size = 28 }) {
@@ -4706,11 +4727,14 @@ function AmplifyPageContent({
   if (preview) {
     const ready = previewLayoutReady({
       clientLoading: client.loading,
-      hasClientLayout: !!clientLayout});
+      hasClientLayout: !!clientLayout,
+      hasServerLayout: !!serverLayout
+    });
     if (!ready) {
       return /* @__PURE__ */ jsxRuntime.jsx(ComposerLayoutStatusProvider, { ready: false, children: previewLoading });
     }
-    return /* @__PURE__ */ jsxRuntime.jsx(ComposerLayoutStatusProvider, { ready: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+    const layoutSettled = !client.loading || !!clientLayout;
+    return /* @__PURE__ */ jsxRuntime.jsx(ComposerLayoutStatusProvider, { ready: layoutSettled, children: /* @__PURE__ */ jsxRuntime.jsx(
       AmplifyRenderer,
       {
         pageConfig: pageConfig ?? void 0,
@@ -4732,7 +4756,7 @@ function AmplifyPageContent({
   if (!hasAmplifyLayout(pageConfig)) {
     return fallback ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fallback }) : null;
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(
+  return /* @__PURE__ */ jsxRuntime.jsx(ComposerLayoutStatusProvider, { ready: true, children: /* @__PURE__ */ jsxRuntime.jsx(
     AmplifyRenderer,
     {
       pageConfig: pageConfig ?? void 0,
@@ -4741,7 +4765,7 @@ function AmplifyPageContent({
       emptyComponent,
       errorComponent
     }
-  );
+  ) });
 }
 
 // src/slot-state.ts