@dxos/client 2.33.5-dev.ea3876ba → 2.33.5-dev.ebc105f7

package/src/services/impl/party.ts

@@ -67,9 +67,7 @@ class PartyService implements IPartyService {
 
     const party = this.echo.getParty(request.partyKey);
     if (party) {
-      return new Stream(({ next }) => {
-        return party.update.on(() => update(next));
-      });
+      return new Stream(({ next }) => party.update.on(() => update(next)));
     } else {
       return new Stream(({ next }) => {
         let unsubscribeParty: () => void;
@@ -91,16 +89,14 @@ class PartyService implements IPartyService {
   }
 
   subscribeParties () {
-    return resultSetToStream(this.echo.queryParties(), (parties): SubscribePartiesResponse => {
-      return ({
-        parties: parties.map(party => ({
-          publicKey: party.key,
-          isOpen: party.isOpen,
-          isActive: party.isActive,
-          members: party.queryMembers().value
-        }))
-      });
-    });
+    return resultSetToStream(this.echo.queryParties(), (parties): SubscribePartiesResponse => ({
+      parties: parties.map(party => ({
+        publicKey: party.key,
+        isOpen: party.isOpen,
+        isActive: party.isActive,
+        members: party.queryMembers().value
+      }))
+    }));
   }
 
   async getPartyDetails (request: GetPartyDetailsRequest): Promise<PartyDetails> {
@@ -277,6 +273,4 @@ class PartyService implements IPartyService {
   }
 }
 
-export const createPartyService = ({ echo }: CreateServicesOpts): PartyService => {
-  return new PartyService(echo);
-};
+export const createPartyService = ({ echo }: CreateServicesOpts): PartyService => new PartyService(echo);

package/src/services/impl/profile.ts

@@ -126,6 +126,4 @@ export class ProfileService implements IProfileService {
   }
 }
 
-export const createProfileService = ({ echo }: CreateServicesOpts): ProfileService => {
-  return new ProfileService(echo);
-};
+export const createProfileService = ({ echo }: CreateServicesOpts): ProfileService => new ProfileService(echo);

package/src/services/impl/services.ts

@@ -9,20 +9,18 @@ import { createProfileService } from './profile';
 import { createSystemService } from './system';
 import { CreateServicesOpts } from './types';
 
-export const createServices = (opts: CreateServicesOpts): Omit<ClientServices, 'DevtoolsHost'> => {
-  return {
-    SystemService: createSystemService(opts),
-    ProfileService: createProfileService(opts),
-    HaloService: createHaloService(opts),
-    PartyService: createPartyService(opts),
-    DataService: opts.echo.dataService,
-    TracingService: {
-      setTracingOptions: () => {
-        throw new Error('Tracing not available.');
-      },
-      subscribeToRpcTrace: () => {
-        throw new Error('Tracing not available.');
-      }
+export const createServices = (opts: CreateServicesOpts): Omit<ClientServices, 'DevtoolsHost'> => ({
+  SystemService: createSystemService(opts),
+  ProfileService: createProfileService(opts),
+  HaloService: createHaloService(opts),
+  PartyService: createPartyService(opts),
+  DataService: opts.echo.dataService,
+  TracingService: {
+    setTracingOptions: () => {
+      throw new Error('Tracing not available.');
+    },
+    subscribeToRpcTrace: () => {
+      throw new Error('Tracing not available.');
     }
-  };
-};
+  }
+});

package/src/services/impl/system.ts

@@ -5,14 +5,10 @@
 import { SystemService } from '../../proto/gen/dxos/client';
 import { CreateServicesOpts } from './types';
 
-export const createSystemService = ({ config, echo }: CreateServicesOpts): SystemService => {
-  return {
-    getConfig: async () => {
-      return config.values;
-    },
+export const createSystemService = ({ config, echo }: CreateServicesOpts): SystemService => ({
+  getConfig: async () => config.values,
 
-    reset: async () => {
-      await echo.reset();
-    }
-  };
-};
+  reset: async () => {
+    await echo.reset();
+  }
+});

package/src/util/subscription.ts

@@ -6,14 +6,12 @@ import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { ResultSet } from '@dxos/echo-db';
 
-export function resultSetToStream<T, U> (resultSet: ResultSet<T>, map: (arg: T[]) => U): Stream<U> {
-  return new Stream(({ next }) => {
-    next(map(resultSet.value));
-    return resultSet.update.on(() => next(map(resultSet.value)));
-  });
-}
+export const resultSetToStream = <T, U>(resultSet: ResultSet<T>, map: (arg: T[]) => U): Stream<U> => new Stream(({ next }) => {
+  next(map(resultSet.value));
+  return resultSet.update.on(() => next(map(resultSet.value)));
+});
 
-export function streamToResultSet<T, U> (stream: Stream<T>, map: (arg?: T) => U[]): ResultSet<U> {
+export const streamToResultSet = <T, U>(stream: Stream<T>, map: (arg?: T) => U[]): ResultSet<U> => {
   const event = new Event();
   let lastItem: T | undefined;
   stream.subscribe(data => {
@@ -21,4 +19,4 @@ export function streamToResultSet<T, U> (stream: Stream<T>, map: (arg?: T) => U[
     event.emit();
   }, () => {});
   return new ResultSet(event, () => map(lastItem));
-}
+};