simplified types

Author: joetannenbaum

packages/react/src/types.ts

@@ -23,6 +23,9 @@ export type ConfigDefaults<O extends BroadcastDriver> = Record<
 
 export type ModelPayload<T> = {
     model: T;
+    connection: string | null;
+    queue: string | null;
+    afterCommit: boolean;
 };
 
 export type ChannelReturnType<
@@ -39,19 +42,23 @@ export type ModelName<T extends string> = T extends `${infer _}.${infer U}`
     ? ModelName<U>
     : T;
 
+type ModelEvent =
+    | "Retrieved"
+    | "Creating"
+    | "Created"
+    | "Updating"
+    | "Updated"
+    | "Saving"
+    | "Saved"
+    | "Deleting"
+    | "Deleted"
+    | "Trashed"
+    | "ForceDeleting"
+    | "ForceDeleted"
+    | "Restoring"
+    | "Restored"
+    | "Replicating";
+
 export type ModelEvents<T extends string> =
-    | `${ModelName<T>}Retrieved`
-    | `${ModelName<T>}Creating`
-    | `${ModelName<T>}Created`
-    | `${ModelName<T>}Updating`
-    | `${ModelName<T>}Updated`
-    | `${ModelName<T>}Saving`
-    | `${ModelName<T>}Saved`
-    | `${ModelName<T>}Deleting`
-    | `${ModelName<T>}Deleted`
-    | `${ModelName<T>}Trashed`
-    | `${ModelName<T>}ForceDeleting`
-    | `${ModelName<T>}ForceDeleted`
-    | `${ModelName<T>}Restoring`
-    | `${ModelName<T>}Restored`
-    | `${ModelName<T>}Replicating`;
+    | `.${ModelName<T>}${ModelEvent}`
+    | `${ModelName<T>}${ModelEvent}`;

packages/vue/src/types.ts

@@ -23,6 +23,9 @@ export type ConfigDefaults<O extends BroadcastDriver> = Record<
 
 export type ModelPayload<T> = {
     model: T;
+    connection: string | null;
+    queue: string | null;
+    afterCommit: boolean;
 };
 
 export type ChannelReturnType<
@@ -39,19 +42,23 @@ export type ModelName<T extends string> = T extends `${infer _}.${infer U}`
     ? ModelName<U>
     : T;
 
+type ModelEvent =
+    | "Retrieved"
+    | "Creating"
+    | "Created"
+    | "Updating"
+    | "Updated"
+    | "Saving"
+    | "Saved"
+    | "Deleting"
+    | "Deleted"
+    | "Trashed"
+    | "ForceDeleting"
+    | "ForceDeleted"
+    | "Restoring"
+    | "Restored"
+    | "Replicating";
+
 export type ModelEvents<T extends string> =
-    | `${ModelName<T>}Retrieved`
-    | `${ModelName<T>}Creating`
-    | `${ModelName<T>}Created`
-    | `${ModelName<T>}Updating`
-    | `${ModelName<T>}Updated`
-    | `${ModelName<T>}Saving`
-    | `${ModelName<T>}Saved`
-    | `${ModelName<T>}Deleting`
-    | `${ModelName<T>}Deleted`
-    | `${ModelName<T>}Trashed`
-    | `${ModelName<T>}ForceDeleting`
-    | `${ModelName<T>}ForceDeleted`
-    | `${ModelName<T>}Restoring`
-    | `${ModelName<T>}Restored`
-    | `${ModelName<T>}Replicating`;
+    | `.${ModelName<T>}${ModelEvent}`
+    | `${ModelName<T>}${ModelEvent}`;