Add alert kinds, minor tweaks, bump version

packages/feeds/src/controller.ts

@@ -79,7 +79,11 @@ export class FeedController {
     }
   })
 
-  listen = async () => (await this.getListener())()
+  listen = () => {
+    const promise = this.getListener().then(call)
+
+    return () => promise.then(call)
+  }
 
   async _getRequestsLoader(requests: RequestItem[]) {
     const seen = new Set()
@@ -389,7 +393,7 @@ export class FeedController {
     return () => {
       const unsubscribers = controllers.map(controller => controller.listen())
 
-      return () => unsubscribers.forEach(async p => call(await p))
+      return () => unsubscribers.forEach(call)
     }
   }
 
@@ -414,9 +418,9 @@ export class FeedController {
     )
 
     return () => {
-      const unsubscribers =  controllers.map(controller => controller.listen())
+      const unsubscribers = controllers.map(controller => controller.listen())
 
-      return () => unsubscribers.forEach(async p => call(await p))
+      return () => unsubscribers.forEach(call)
     }
   }
 
@@ -438,9 +442,9 @@ export class FeedController {
     )
 
     return () => {
-      const unsubscribers =  controllers.map(controller => controller.listen())
+      const unsubscribers = controllers.map(controller => controller.listen())
 
-      return () => unsubscribers.forEach(async p => call(await p))
+      return () => unsubscribers.forEach(call)
     }
   }
 }

packages/feeds/src/utils.ts

@@ -192,10 +192,17 @@ export const feedsFromFilter = ({since, until, ...filter}: Filter) => {
   return feeds
 }
 
-export const feedFromFilter = (filter: Filter) => makeIntersectionFeed(...feedsFromFilter(filter))
+export const feedFromFilter = (filter: Filter) => {
+  const feeds = feedsFromFilter(filter)
 
-export const feedFromFilters = (filters: Filter[]) =>
-  makeUnionFeed(...unionFilters(filters).map(filter => feedFromFilter(filter)))
+  return feeds.length === 1 ? feeds[0] : makeIntersectionFeed(...feeds)
+}
+
+export const feedFromFilters = (filters: Filter[]) => {
+  const feeds = unionFilters(filters).map(filter => feedFromFilter(filter))
+
+  return feeds.length === 1 ? feeds[0] : makeUnionFeed(...feeds)
+}
 
 export const walkFeed = (feed: Feed, visit: (feed: Feed) => void) => {
   visit(feed)