fix(stega): revert allow setting stega options on client.fetch (#424

) Revert "feat(stega): allow setting `stega` options on `client.fetch` (#419)" This reverts commit d38afd8.
sanity-io · Nov 28, 2023 · fdbb57a · fdbb57a
1 parent 7726326
commit fdbb57a
Show file tree

Hide file tree

Showing 4 changed files with 182 additions and 369 deletions.
diff --git a/src/data/dataMethods.ts b/src/data/dataMethods.ts
@@ -69,11 +69,6 @@ export function _fetch<R, Q extends QueryParams>(
   params?: Q,
   options: FilteredResponseQueryOptions | UnfilteredResponseQueryOptions = {},
 ): Observable<RawQueryResponse<R> | R> {
-  if ('stega' in options && options['stega'] !== undefined && options['stega'] !== false) {
-    throw new Error(
-      `It looks like you're using options meant for '@sanity/client/stega'. Make sure you're using the right import. Or set 'stega' in 'fetch' to 'false'.`,
-    )
-  }
   const mapResponse =
     options.filterResponse === false ? (res: Any) => res : (res: Any) => res.result
   const {cache, next, ...opts} = {

diff --git a/src/stega/SanityStegaClient.ts b/src/stega/SanityStegaClient.ts
@@ -12,19 +12,9 @@ import type {
   RawQueryResponse,
   UnfilteredResponseQueryOptions,
 } from '../types'
-import {
-  defaultStegaConfig,
-  initStegaConfig,
-  splitConfig,
-  splitStegaConfigFromFetchOptions,
-} from './config'
+import {defaultStegaConfig, initStegaConfig, splitConfig} from './config'
 import {stegaEncodeSourceMap} from './stegaEncodeSourceMap'
-import {
-  ClientStegaConfig,
-  InitializedClientStegaConfig,
-  InitializedStegaConfig,
-  StegaConfig,
-} from './types'
+import {ClientStegaConfig, InitializedClientStegaConfig, InitializedStegaConfig} from './types'
 
 /** @public */
 export class ObservableSanityStegaClient extends ObservableSanityClient {
@@ -110,7 +100,7 @@ export class ObservableSanityStegaClient extends ObservableSanityClient {
   fetch<R = Any, Q = QueryParams>(
     query: string,
     params: Q | undefined,
-    options: FilteredResponseQueryOptions & {stega?: boolean | StegaConfig},
+    options: FilteredResponseQueryOptions,
   ): Observable<R>
   /**
    * Perform a GROQ-query against the configured dataset.
@@ -122,20 +112,14 @@ export class ObservableSanityStegaClient extends ObservableSanityClient {
   fetch<R = Any, Q = QueryParams>(
     query: string,
     params: Q | undefined,
-    options: UnfilteredResponseQueryOptions & {stega?: boolean | StegaConfig},
+    options: UnfilteredResponseQueryOptions,
   ): Observable<RawQueryResponse<R>>
   fetch<R, Q extends QueryParams>(
     query: string,
     params?: Q,
-    _options: (FilteredResponseQueryOptions | UnfilteredResponseQueryOptions) & {
-      stega?: boolean | StegaConfig
-    } = {},
+    options: FilteredResponseQueryOptions | UnfilteredResponseQueryOptions = {},
   ): Observable<RawQueryResponse<R> | R> {
-    const {stegaConfig, fetchOptions: options} = splitStegaConfigFromFetchOptions(
-      _options,
-      this.stegaConfig,
-    )
-    if (!stegaConfig.enabled) {
+    if (!this.stegaConfig.enabled) {
       return super.fetch<R, Q>(query, params, options as Any)
     }
     const {filterResponse: originalFilterResponse = true} = options
@@ -151,7 +135,7 @@ export class ObservableSanityStegaClient extends ObservableSanityClient {
       .pipe(
         map((res: Any) => {
           const {result: _result, resultSourceMap} = res as RawQueryResponse<R>
-          const result = stegaEncodeSourceMap(_result, resultSourceMap, stegaConfig)
+          const result = stegaEncodeSourceMap(_result, resultSourceMap, this.stegaConfig)
           return originalFilterResponse ? result : {...res, result}
         }),
       )
@@ -249,7 +233,7 @@ export class SanityStegaClient extends SanityClient {
   fetch<R = Any, Q = QueryParams>(
     query: string,
     params: Q | undefined,
-    options: FilteredResponseQueryOptions & {stega?: boolean | StegaConfig},
+    options: FilteredResponseQueryOptions,
   ): Promise<R>
   /**
    * Perform a GROQ-query against the configured dataset.
@@ -261,20 +245,14 @@ export class SanityStegaClient extends SanityClient {
   fetch<R = Any, Q = QueryParams>(
     query: string,
     params: Q | undefined,
-    options: UnfilteredResponseQueryOptions & {stega?: boolean | StegaConfig},
+    options: UnfilteredResponseQueryOptions,
   ): Promise<RawQueryResponse<R>>
   fetch<R, Q extends QueryParams>(
     query: string,
     params?: Q,
-    _options: (FilteredResponseQueryOptions | UnfilteredResponseQueryOptions) & {
-      stega?: boolean | StegaConfig
-    } = {},
+    options: FilteredResponseQueryOptions | UnfilteredResponseQueryOptions = {},
   ): Promise<RawQueryResponse<R> | R> {
-    const {stegaConfig, fetchOptions: options} = splitStegaConfigFromFetchOptions(
-      _options,
-      this.stegaConfig,
-    )
-    if (!stegaConfig.enabled) {
+    if (!this.stegaConfig.enabled) {
       return super.fetch<R, Q>(query, params, options as Any)
     }
     const {filterResponse: originalFilterResponse = true} = options
@@ -289,7 +267,7 @@ export class SanityStegaClient extends SanityClient {
       )
       .then((res: Any) => {
         const {result: _result, resultSourceMap} = res as RawQueryResponse<R>
-        const result = stegaEncodeSourceMap(_result, resultSourceMap, stegaConfig)
+        const result = stegaEncodeSourceMap(_result, resultSourceMap, this.stegaConfig)
         return originalFilterResponse ? result : {...res, result}
       })
   }

diff --git a/src/stega/config.ts b/src/stega/config.ts
@@ -1,8 +1,4 @@
-import type {
-  ClientConfig,
-  FilteredResponseQueryOptions,
-  UnfilteredResponseQueryOptions,
-} from '../types'
+import type {ClientConfig} from '../types'
 import type {ClientStegaConfig, InitializedStegaConfig, StegaConfig} from './types'
 
 export const defaultStegaConfig: StegaConfig = {
@@ -57,20 +53,3 @@ export const initStegaConfig = (
 
   return newConfig
 }
-
-export function splitStegaConfigFromFetchOptions(
-  options: (FilteredResponseQueryOptions | UnfilteredResponseQueryOptions) & {
-    stega?: boolean | StegaConfig
-  },
-  initializedStegaConfig: InitializedStegaConfig,
-): {
-  fetchOptions: FilteredResponseQueryOptions | UnfilteredResponseQueryOptions
-  stegaConfig: InitializedStegaConfig
-} {
-  const {stega = {}, ...fetchOptions} = options
-  const stegaConfig = initStegaConfig(
-    typeof stega === 'boolean' ? {enabled: stega} : stega,
-    initializedStegaConfig,
-  )
-  return {fetchOptions, stegaConfig}
-}