fix: type narrowing

deptyped · Feb 14, 2023 · 1e7722b · 1e7722b
1 parent 66cb6f3
commit 1e7722b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/src/deps.ts b/src/deps.ts
@@ -3,6 +3,7 @@ export {
   type CallbackQueryContext,
   type ChatTypeContext,
   type Context,
+  type Filter,
   type MiddlewareFn,
 } from "https://lib.deno.dev/x/grammy@1.x/mod.ts";
 

diff --git a/src/types.ts b/src/types.ts
@@ -2,10 +2,9 @@ import {
   Chat,
   ChatMember,
   ChatMemberUpdated,
-  ChatShared,
   Context,
+  Filter,
   User,
-  UserShared,
 } from "./deps.ts";
 
 export type MaybePromise<T> = T | Promise<T>;
@@ -64,30 +63,18 @@ export type ChatMemberContext<
 
 // ctx.msg.user_shared
 
-type UserSharedType = {
-  msg: {
-    user_shared: UserShared;
-  };
-  message: {
-    user_shared: UserShared;
-  };
-};
-
 export type UserSharedContext<
   C extends Context = Context,
-> = C & UserSharedType;
+> = Filter<
+  C,
+  ":user_shared"
+>;
 
 // ctx.msg.user_shared
 
-type ChatSharedType = {
-  msg: {
-    chat_shared: ChatShared;
-  };
-  message: {
-    chat_shared: ChatShared;
-  };
-};
-
 export type ChatSharedContext<
   C extends Context = Context,
-> = C & ChatSharedType;
+> = Filter<
+  C,
+  ":chat_shared"
+>;