refactor: simplify client

seb-oss · Aug 11, 2023 · d6d7b90 · d6d7b90
1 parent b868ede
commit d6d7b90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/packages/pubsub/src/lib/client.ts b/packages/pubsub/src/lib/client.ts
@@ -5,15 +5,10 @@ export type ClientConfig = {
   projectId: string
 }
 
-const localProjectId: string = 'local'
+const localProjectId = 'local'
 const clients: Record<string, PubSub> = {}
 
-const init = (config?: ClientConfig) => {
-  let projectId: string = localProjectId
-  if (config && config.projectId) {
-    projectId = config.projectId
-  }
-
+const init = ({ projectId }: ClientConfig = { projectId: localProjectId }) => {
   if (!clients[projectId]) {
     if (projectId === localProjectId) {
       // Create a default client when there is no config.

diff --git a/packages/pubsub/src/lib/pubsub.spec.ts b/packages/pubsub/src/lib/pubsub.spec.ts
@@ -143,7 +143,9 @@ describe('creates an instance of PubSub', () => {
 
       await createdPubsub.topic(topicName, mockConfig).publish(topicData)
 
-      expect(PubSub).toHaveBeenCalledWith(mockConfig)
+      expect(PubSub).toHaveBeenCalledWith({
+        projectId: mockConfig.projectId,
+      })
     })
 
     it('when subscribing', async () => {
@@ -154,7 +156,9 @@ describe('creates an instance of PubSub', () => {
         onSuccess: () => undefined,
       })
 
-      expect(PubSub).toHaveBeenCalledWith(mockConfig)
+      expect(PubSub).toHaveBeenCalledWith({
+        projectId: mockConfig.projectId,
+      })
     })
   })
 })