@trigger.dev/sdk 2.0.0-next.20 → 2.0.0-next.21

package/dist/index.d.ts

@@ -3640,7 +3640,9 @@ declare class ExternalSource<TIntegration extends TriggerIntegration<Integration
     get id(): string;
     get version(): string;
 }
-type ExternalSourceParams<TExternalSource extends ExternalSource<any, any, any>> = TExternalSource extends ExternalSource<any, infer TParams, any> ? TParams : never;
+type ExternalSourceParams<TExternalSource extends ExternalSource<any, any, any>> = TExternalSource extends ExternalSource<any, infer TParams, any> ? TParams & {
+    filter?: EventFilter;
+} : never;
 type ExternalSourceTriggerOptions<TEventSpecification extends EventSpecification<any>, TEventSource extends ExternalSource<any, any, any>> = {
     event: TEventSpecification;
     source: TEventSource;

package/dist/index.js

@@ -1038,24 +1038,18 @@ var GetEventSchema = import_zod13.z.object({
 });
 
 // ../internal/src/utils.ts
-function deepMergeFilters(filter, other) {
-  const result = {
-    ...filter
-  };
-  for (const key in other) {
-    if (other.hasOwnProperty(key)) {
-      const otherValue = other[key];
-      if (typeof otherValue === "object" && !Array.isArray(otherValue) && otherValue !== null) {
+function deepMergeFilters(...filters) {
+  const result = {};
+  for (const filter of filters) {
+    for (const key in filter) {
+      if (filter.hasOwnProperty(key)) {
         const filterValue = filter[key];
-        if (filterValue && typeof filterValue === "object" && !Array.isArray(filterValue)) {
-          result[key] = deepMergeFilters(filterValue, otherValue);
+        const existingValue = result[key];
+        if (existingValue && typeof existingValue === "object" && typeof filterValue === "object" && !Array.isArray(existingValue) && !Array.isArray(filterValue) && existingValue !== null && filterValue !== null) {
+          result[key] = deepMergeFilters(existingValue, filterValue);
         } else {
-          result[key] = {
-            ...other[key]
-          };
+          result[key] = filterValue;
         }
-      } else {
-        result[key] = other[key];
       }
     }
   }
@@ -1862,16 +1856,23 @@ var IO = class {
           throw error;
         }
         if (onError) {
-          const onErrorResult = onError(error, task, this);
-          if (onErrorResult) {
-            if (onErrorResult instanceof Error) {
-              error = onErrorResult;
-            } else {
-              const parsedError2 = ErrorWithStackSchema.safeParse(onErrorResult.error);
-              throw new RetryWithTaskError(parsedError2.success ? parsedError2.data : {
-                message: "Unknown error"
-              }, task, onErrorResult.retryAt);
+          try {
+            const onErrorResult = onError(error, task, this);
+            if (onErrorResult) {
+              if (onErrorResult instanceof Error) {
+                error = onErrorResult;
+              } else {
+                const parsedError2 = ErrorWithStackSchema.safeParse(onErrorResult.error);
+                throw new RetryWithTaskError(parsedError2.success ? parsedError2.data : {
+                  message: "Unknown error"
+                }, task, onErrorResult.retryAt);
+              }
+            }
+          } catch (innerError) {
+            if (isTriggerError(innerError)) {
+              throw innerError;
             }
+            error = innerError;
           }
         }
         const parsedError = ErrorWithStackSchema.safeParse(error);
@@ -2756,7 +2757,7 @@ var ExternalSourceTrigger = class {
       title: "External Source",
       rule: {
         event: this.event.name,
-        payload: deepMergeFilters(this.options.source.filter(this.options.params), this.event.filter ?? {}),
+        payload: deepMergeFilters(this.options.source.filter(this.options.params), this.event.filter ?? {}, this.options.params.filter ?? {}),
         source: this.event.source
       },
       properties: this.options.source.properties(this.options.params)