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

package/dist/index.d.ts

@@ -3512,6 +3512,7 @@ interface Trigger<TEventSpec extends EventSpecification<any>> {
     attachToJob(triggerClient: TriggerClient, job: Job<Trigger<TEventSpec>, any>): void;
     preprocessRuns: boolean;
 }
+type TriggerPayload<TTrigger> = TTrigger extends Trigger<EventSpecification<infer TEvent>> ? TEvent : never;
 type EventSpecificationExample = {
     id: string;
     name: string;
@@ -3640,7 +3641,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;
@@ -4206,6 +4209,7 @@ type ExtractIntegrationClientClient<TIntegrationClient extends IntegrationClient
     runTask: IntegrationRunTaskFunction<TClient>;
 } : never;
 type ExtractIntegrationClient<TIntegrationClient extends IntegrationClient<any, any>> = ExtractIntegrationClientClient<TIntegrationClient> & ExtractTasks<TIntegrationClient["tasks"]>;
+type IntegrationIO<TIntegration extends TriggerIntegration<IntegrationClient<any, any>>> = ExtractIntegrationClient<TIntegration["client"]>;
 type ExtractIntegrations<TIntegrations extends Record<string, TriggerIntegration<IntegrationClient<any, any>>>> = {
     [key in keyof TIntegrations]: ExtractIntegrationClient<TIntegrations[key]["client"]>;
 };
@@ -4259,6 +4263,8 @@ type JobOptions<TTrigger extends Trigger<EventSpecification<any>>, TIntegrations
      */
     run: (payload: TriggerEventType<TTrigger>, io: IOWithIntegrations<TIntegrations>, context: TriggerContext) => Promise<any>;
 };
+type JobPayload<TJob> = TJob extends Job<Trigger<EventSpecification<infer TEvent>>, any> ? TEvent : never;
+type JobIO<TJob> = TJob extends Job<any, infer TIntegrations> ? IOWithIntegrations<TIntegrations> : never;
 /** A [Job](https://trigger.dev/docs/documentation/concepts/jobs) is used to define the [Trigger](https://trigger.dev/docs/documentation/concepts/triggers), metadata, and what happens when it runs. */
 declare class Job<TTrigger extends Trigger<EventSpecification<any>>, TIntegrations extends Record<string, TriggerIntegration<IntegrationClient<any, any>>> = {}> {
     #private;
@@ -4455,4 +4461,4 @@ type Task = ServerTask;
 type SentEvent = ApiEventLog;
 declare function redactString(strings: TemplateStringsArray, ...interpolations: string[]): RedactString;
 
-export { AuthenticatedTask, ClientFactory, CronTrigger, DynamicIntervalOptions, DynamicSchedule, DynamicTrigger, DynamicTriggerOptions, EventFilter, EventSpecification, EventSpecificationExample, EventTrigger, EventTypeFromSpecification, ExternalSource, ExternalSourceParams, ExternalSourceTrigger, ExternalSourceTriggerOptions, HandlerEvent, HttpSourceEvent, IO, IOLogger, IOOptions, IOTask, IOWithIntegrations, IntegrationClient, IntervalTrigger, Job, JobOptions, Logger, MissingConnectionNotification, MissingConnectionResolvedNotification, NormalizedRequest, PreprocessResults, RedactString, SentEvent, Task, TaskLogger, Trigger, TriggerClient, TriggerClientOptions, TriggerContext, TriggerEventType, TriggerIntegration, TriggerPreprocessContext, authenticatedTask, cronTrigger, eventTrigger, intervalTrigger, isTriggerError, missingConnectionNotification, missingConnectionResolvedNotification, omit, redactString };
+export { AuthenticatedTask, ClientFactory, CronTrigger, DynamicIntervalOptions, DynamicSchedule, DynamicTrigger, DynamicTriggerOptions, EventFilter, EventSpecification, EventSpecificationExample, EventTrigger, EventTypeFromSpecification, ExternalSource, ExternalSourceParams, ExternalSourceTrigger, ExternalSourceTriggerOptions, HandlerEvent, HttpSourceEvent, IO, IOLogger, IOOptions, IOTask, IOWithIntegrations, IntegrationClient, IntegrationIO, IntervalTrigger, Job, JobIO, JobOptions, JobPayload, Logger, MissingConnectionNotification, MissingConnectionResolvedNotification, NormalizedRequest, PreprocessResults, RedactString, SentEvent, Task, TaskLogger, Trigger, TriggerClient, TriggerClientOptions, TriggerContext, TriggerEventType, TriggerIntegration, TriggerPayload, TriggerPreprocessContext, authenticatedTask, cronTrigger, eventTrigger, intervalTrigger, isTriggerError, missingConnectionNotification, missingConnectionResolvedNotification, omit, redactString };

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)