refactor: create getClientOptions

Author: eduardoboucas

src/client.ts

@@ -1,3 +1,4 @@
+import { EnvironmentContext, getEnvironmentContext, MissingBlobsEnvironmentError } from './environment.ts'
 import { fetchAndRetry } from './retry.ts'
 import { BlobInput, Fetcher, HTTPMethod } from './types.ts'
 
@@ -99,3 +100,33 @@ export class Client {
     return res
   }
 }
+
+/**
+ * Merges a set of options supplied by the user when getting a reference to a
+ * store with a context object found in the environment.
+ *
+ * @param options User-supplied options
+ * @param contextOverride Context to be used instead of the environment object
+ */
+export const getClientOptions = (
+  options: Partial<ClientOptions>,
+  contextOverride?: EnvironmentContext,
+): ClientOptions => {
+  const context = contextOverride ?? getEnvironmentContext()
+  const siteID = context.siteID ?? options.siteID
+  const token = context.token ?? options.token
+
+  if (!siteID || !token) {
+    throw new MissingBlobsEnvironmentError(['siteID', 'token'])
+  }
+
+  const clientOptions = {
+    apiURL: context.apiURL ?? options.apiURL,
+    edgeURL: context.edgeURL ?? options.edgeURL,
+    fetch: options.fetch,
+    siteID,
+    token,
+  }
+
+  return clientOptions
+}

src/store.ts

@@ -1,4 +1,4 @@
-import { Client, ClientOptions } from './client.ts'
+import { Client, ClientOptions, getClientOptions } from './client.ts'
 import { getEnvironmentContext, MissingBlobsEnvironmentError } from './environment.ts'
 import { BlobInput, HTTPMethod } from './types.ts'
 
@@ -138,21 +138,19 @@ class Store {
   }
 }
 
+/**
+ * Gets a reference to a deploy-scoped store.
+ */
 export const getDeployStore = (options: Partial<ClientOptions> = {}): Store => {
   const context = getEnvironmentContext()
-  const { deployID, ...contextOptions } = context
-  const clientOptions = {
-    ...contextOptions,
-    ...options,
-    siteID: options.siteID ?? context.siteID,
-    token: options.token ?? context.token,
-  }
+  const { deployID } = context
 
-  if (!deployID || !clientOptions.siteID || !clientOptions.token) {
-    throw new MissingBlobsEnvironmentError(['deployID', 'siteID', 'token'])
+  if (!deployID) {
+    throw new MissingBlobsEnvironmentError(['deployID'])
   }
 
-  const client = new Client(clientOptions as ClientOptions)
+  const clientOptions = getClientOptions(options, context)
+  const client = new Client(clientOptions)
 
   return new Store({ client, deployID })
 }
@@ -162,59 +160,44 @@ interface GetStoreOptions extends Partial<ClientOptions> {
   name?: string
 }
 
+/**
+ * Gets a reference to a store.
+ *
+ * @param input Either a string containing the store name or an options object
+ */
 export const getStore: {
   (name: string): Store
   (options: GetStoreOptions): Store
 } = (input) => {
-  const context = getEnvironmentContext()
-
   if (typeof input === 'string') {
-    if (!context.siteID || !context.token) {
-      throw new MissingBlobsEnvironmentError(['siteID', 'token'])
-    }
-
-    const client = new Client({
-      apiURL: context.apiURL,
-      edgeURL: context.edgeURL,
-      siteID: context.siteID,
-      token: context.token,
-    })
+    const clientOptions = getClientOptions({})
+    const client = new Client(clientOptions)
 
     return new Store({ client, name: input })
   }
 
   if (typeof input.name === 'string') {
-    const { name, ...options } = input
-    const clientOptions = {
-      ...context,
-      ...options,
-      siteID: options.siteID ?? context.siteID,
-      token: options.token ?? context.token,
-    }
+    const { name } = input
+    const clientOptions = getClientOptions(input)
 
-    if (!clientOptions.siteID || !clientOptions.token) {
-      throw new MissingBlobsEnvironmentError(['siteID', 'token'])
+    if (!name) {
+      throw new MissingBlobsEnvironmentError(['name'])
     }
 
-    const client = new Client(clientOptions as ClientOptions)
+    const client = new Client(clientOptions)
 
     return new Store({ client, name })
   }
 
   if (typeof input.deployID === 'string') {
-    const { deployID, name, ...options } = input
-    const clientOptions = {
-      ...context,
-      ...options,
-      siteID: options.siteID ?? context.siteID,
-      token: options.token ?? context.token,
-    }
+    const clientOptions = getClientOptions(input)
+    const { deployID } = input
 
-    if (!clientOptions.siteID || !clientOptions.token) {
-      throw new MissingBlobsEnvironmentError(['siteID', 'token'])
+    if (!deployID) {
+      throw new MissingBlobsEnvironmentError(['deployID'])
     }
 
-    const client = new Client(clientOptions as ClientOptions)
+    const client = new Client(clientOptions)
 
     return new Store({ client, deployID })
   }