@zapier/zapier-sdk 0.33.3 → 0.33.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zapier/zapier-sdk
 
+## 0.33.4
+
+### Patch Changes
+
+- d9e0f1d: Fix user properties being overwritten by context merge in telemetry events
+
 ## 0.33.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -5513,7 +5513,7 @@ function getCpuTime() {
 }
 
 // src/plugins/eventEmission/builders.ts
-var SDK_VERSION = "0.33.3";
+var SDK_VERSION = "0.33.4";
 function createBaseEvent(context = {}) {
   return {
     event_id: generateEventId(),
@@ -5648,13 +5648,22 @@ async function emitWithTimeout(transport, subject, event) {
   } catch {
   }
 }
+function mergeUserContext(event, userContext) {
+  const merged = { ...event };
+  for (const [key, value] of Object.entries(userContext)) {
+    if (merged[key] == null) {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let enrichedEvent = event;
     if (userContextPromise) {
       try {
         const userContext = await userContextPromise;
-        enrichedEvent = Object.assign({}, event, userContext);
+        enrichedEvent = mergeUserContext(event, userContext);
       } catch {
       }
     }
@@ -5771,7 +5780,7 @@ var eventEmissionPlugin = ({ context }) => {
     };
     try {
       const userContext = await getUserContext;
-      return { ...baseEvent, ...userContext };
+      return mergeUserContext(baseEvent, userContext);
     } catch {
       return baseEvent;
     }
@@ -5824,7 +5833,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5852,7 +5861,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5874,7 +5883,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          signalEvent = { ...signalEvent, ...userContext };
+          signalEvent = mergeUserContext(signalEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5908,7 +5917,7 @@ var eventEmissionPlugin = ({ context }) => {
     });
     try {
       const userContext = await getUserContext;
-      exitEvent = { ...exitEvent, ...userContext };
+      exitEvent = mergeUserContext(exitEvent, userContext);
     } catch {
     }
     await emitWithTimeout(

package/dist/index.mjs

@@ -5491,7 +5491,7 @@ function getCpuTime() {
 }
 
 // src/plugins/eventEmission/builders.ts
-var SDK_VERSION = "0.33.3";
+var SDK_VERSION = "0.33.4";
 function createBaseEvent(context = {}) {
   return {
     event_id: generateEventId(),
@@ -5626,13 +5626,22 @@ async function emitWithTimeout(transport, subject, event) {
   } catch {
   }
 }
+function mergeUserContext(event, userContext) {
+  const merged = { ...event };
+  for (const [key, value] of Object.entries(userContext)) {
+    if (merged[key] == null) {
+      merged[key] = value;
+    }
+  }
+  return merged;
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
   try {
     let enrichedEvent = event;
     if (userContextPromise) {
       try {
         const userContext = await userContextPromise;
-        enrichedEvent = Object.assign({}, event, userContext);
+        enrichedEvent = mergeUserContext(event, userContext);
       } catch {
       }
     }
@@ -5749,7 +5758,7 @@ var eventEmissionPlugin = ({ context }) => {
     };
     try {
       const userContext = await getUserContext;
-      return { ...baseEvent, ...userContext };
+      return mergeUserContext(baseEvent, userContext);
     } catch {
       return baseEvent;
     }
@@ -5802,7 +5811,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5830,7 +5839,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          errorEvent = { ...errorEvent, ...userContext };
+          errorEvent = mergeUserContext(errorEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5852,7 +5861,7 @@ var eventEmissionPlugin = ({ context }) => {
         });
         try {
           const userContext = await getUserContext;
-          signalEvent = { ...signalEvent, ...userContext };
+          signalEvent = mergeUserContext(signalEvent, userContext);
         } catch {
         }
         await emitWithTimeout(
@@ -5886,7 +5895,7 @@ var eventEmissionPlugin = ({ context }) => {
     });
     try {
       const userContext = await getUserContext;
-      exitEvent = { ...exitEvent, ...userContext };
+      exitEvent = mergeUserContext(exitEvent, userContext);
     } catch {
     }
     await emitWithTimeout(

package/dist/plugins/eventEmission/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAsCnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;QAEpD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAIvB,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA+ED,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAmVtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAsCnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;QAEpD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAIvB,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAyFD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAmVtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}

package/dist/plugins/eventEmission/index.js

@@ -55,13 +55,22 @@ async function emitWithTimeout(transport, subject, event) {
         // Silently ignore telemetry failures
     }
 }
+function mergeUserContext(event, userContext) {
+    const merged = { ...event };
+    for (const [key, value] of Object.entries(userContext)) {
+        if (merged[key] == null) {
+            merged[key] = value;
+        }
+    }
+    return merged;
+}
 async function silentEmit(transport, subject, event, userContextPromise) {
     try {
         let enrichedEvent = event;
         if (userContextPromise) {
             try {
                 const userContext = await userContextPromise;
-                enrichedEvent = Object.assign({}, event, userContext);
+                enrichedEvent = mergeUserContext(event, userContext);
             }
             catch {
                 // If user context promise fails, continue with original event
@@ -189,7 +198,7 @@ export const eventEmissionPlugin = ({ context }) => {
         // Enrich with user context if available
         try {
             const userContext = await getUserContext;
-            return { ...baseEvent, ...userContext };
+            return mergeUserContext(baseEvent, userContext);
         }
         catch {
             // Return base event if user context fails
@@ -240,7 +249,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 // Enrich with user context if available
                 try {
                     const userContext = await getUserContext;
-                    errorEvent = { ...errorEvent, ...userContext };
+                    errorEvent = mergeUserContext(errorEvent, userContext);
                 }
                 catch {
                     // Continue with original event if user context fails
@@ -272,7 +281,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 // Enrich with user context if available
                 try {
                     const userContext = await getUserContext;
-                    errorEvent = { ...errorEvent, ...userContext };
+                    errorEvent = mergeUserContext(errorEvent, userContext);
                 }
                 catch {
                     // Continue with original event if user context fails
@@ -294,7 +303,7 @@ export const eventEmissionPlugin = ({ context }) => {
                 // Enrich with user context if available
                 try {
                     const userContext = await getUserContext;
-                    signalEvent = { ...signalEvent, ...userContext };
+                    signalEvent = mergeUserContext(signalEvent, userContext);
                 }
                 catch {
                     // Continue with original event if user context fails
@@ -331,7 +340,7 @@ export const eventEmissionPlugin = ({ context }) => {
         });
         try {
             const userContext = await getUserContext;
-            exitEvent = { ...exitEvent, ...userContext };
+            exitEvent = mergeUserContext(exitEvent, userContext);
         }
         catch {
             // Continue with original event if user context fails

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk",
-  "version": "0.33.3",
+  "version": "0.33.4",
   "description": "Complete Zapier SDK - combines all Zapier SDK packages",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",