Merge branch 'pnpm' into framework-t3-example

inngest · Jul 27, 2023 · b6d7fcd · b6d7fcd
2 parents 66d720e + cf0042f
commit b6d7fcd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 200 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -135,6 +135,8 @@ jobs:
           path: examples/apps/${{ matrix.example }}
 
       # Install dependencies in the example repo
+      # Don't use "npm ci", "--immutable" etc., as example repos won't be
+      # shipped with lock files.
       - name: Install example dependencies
         run: ni
         working-directory: examples/apps/${{ matrix.example }}

diff --git a/README.md b/README.md
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+./packages/inngest/README.md
diff --git a/packages/inngest/CHANGELOG.md b/packages/inngest/CHANGELOG.md
@@ -1,5 +1,15 @@
 # inngest
 
+## 2.4.0
+
+### Minor Changes
+
+- 6cb6719: Allow filtering of events within triggers
+
+### Patch Changes
+
+- 55c889c: Expose raw error message if status is unknown
+
 ## 2.3.0
 
 ### Minor Changes

diff --git a/packages/inngest/package.json b/packages/inngest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inngest",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Official SDK for Inngest.com",
   "main": "./index.js",
   "types": "./index.d.ts",

diff --git a/packages/inngest/src/components/Inngest.ts b/packages/inngest/src/components/Inngest.ts
@@ -244,7 +244,11 @@ export class Inngest<TOpts extends ClientOptions = ClientOptions> {
       case 500:
         errorMessage = "Internal server error";
         break;
+      default:
+        errorMessage = await response.text();
+        break;
     }
+
     return new Error(`Inngest API Error: ${response.status} ${errorMessage}`);
   }
 
@@ -483,10 +487,23 @@ export class Inngest<TOpts extends ClientOptions = ClientOptions> {
       keyof EventsFromOpts<TOpts> & string
     >;
 
+    let sanitizedTrigger: FunctionTrigger<keyof EventsFromOpts<TOpts> & string>;
+
+    if (typeof trigger === "string") {
+      sanitizedTrigger = { event: trigger };
+    } else if (trigger.event) {
+      sanitizedTrigger = {
+        event: trigger.event,
+        expression: trigger.if,
+      };
+    } else {
+      sanitizedTrigger = trigger;
+    }
+
     return new InngestFunction(
       this,
       sanitizedOpts,
-      typeof trigger === "string" ? { event: trigger } : trigger,
+      sanitizedTrigger,
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
       handler as any
     );

diff --git a/packages/inngest/src/types.ts b/packages/inngest/src/types.ts
@@ -606,6 +606,7 @@ export type TriggerOptions<T extends string> =
   | StrictUnion<
       | {
           event: T;
+          if?: string;
         }
       | {
           cron: string;