@sanity/client 6.27.2 → 6.27.3-canary.1

package/dist/index.browser.d.cts

@@ -405,7 +405,7 @@ export declare type ClientPerspective =
   | 'published'
   | 'drafts'
   | 'raw'
-  | ('published' | 'drafts' | ReleaseId)[]
+  | StackablePerspective[]
 
 /** @public */
 export declare type ClientReturn<
@@ -2219,7 +2219,10 @@ export declare type ReconnectEvent = {
   type: 'reconnect'
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated – The `r`-prefix is not required, use `string` instead
+ */
 export declare type ReleaseId = `r${string}`
 
 /**
@@ -2994,6 +2997,9 @@ export declare interface SingleMutationResult {
   }[]
 }
 
+/** @public */
+export declare type StackablePerspective = ('published' | 'drafts' | string) & {}
+
 /** @public */
 export declare interface StegaConfig {
   /**

package/dist/index.browser.d.ts

@@ -405,7 +405,7 @@ export declare type ClientPerspective =
   | 'published'
   | 'drafts'
   | 'raw'
-  | ('published' | 'drafts' | ReleaseId)[]
+  | StackablePerspective[]
 
 /** @public */
 export declare type ClientReturn<
@@ -2219,7 +2219,10 @@ export declare type ReconnectEvent = {
   type: 'reconnect'
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated – The `r`-prefix is not required, use `string` instead
+ */
 export declare type ReleaseId = `r${string}`
 
 /**
@@ -2994,6 +2997,9 @@ export declare interface SingleMutationResult {
   }[]
 }
 
+/** @public */
+export declare type StackablePerspective = ('published' | 'drafts' | string) & {}
+
 /** @public */
 export declare interface StegaConfig {
   /**

package/dist/index.browser.js

@@ -1,9 +1,9 @@
 import { getIt } from "get-it";
 import { adapter, environment } from "get-it";
 import { retry, jsonRequest, jsonResponse, progress, observable } from "get-it/middleware";
-import { Observable, defer, isObservable, of, mergeMap, from, lastValueFrom, shareReplay, catchError, concat, timer, throwError, EMPTY } from "rxjs";
+import { Observable, defer, isObservable, of, mergeMap, from, lastValueFrom, shareReplay, catchError, concat, timer, throwError, tap, finalize, share, merge, EMPTY } from "rxjs";
 import { stegaClean } from "./_chunks-es/stegaClean.js";
-import { combineLatestWith, map, filter } from "rxjs/operators";
+import { combineLatestWith, map, filter, finalize as finalize$1 } from "rxjs/operators";
 class ClientError extends Error {
   response;
   statusCode = 400;
@@ -196,25 +196,20 @@ function validateApiVersion(apiVersion) {
   if (!(/^\d{4}-\d{2}-\d{2}$/.test(apiVersion) && apiDate instanceof Date && apiDate.getTime() > 0))
     throw new Error("Invalid API version string, expected `1` or date in format `YYYY-MM-DD`");
 }
+const VALID_PERSPECTIVE = /^[a-z0-9_]+$/i;
 function validateApiPerspective(perspective) {
-  if (Array.isArray(perspective)) {
-    for (const perspectiveValue of perspective)
-      if (perspectiveValue !== "published" && perspectiveValue !== "drafts" && !(typeof perspectiveValue == "string" && perspectiveValue.startsWith("r") && perspectiveValue !== "raw"))
-        throw new TypeError(
-          "Invalid API perspective value, expected `published`, `drafts` or a valid release identifier string"
-        );
-    return;
-  }
-  switch (perspective) {
-    case "previewDrafts":
-    case "drafts":
-    case "published":
-    case "raw":
-      return;
-    default:
-      throw new TypeError(
-        "Invalid API perspective string, expected `published`, `previewDrafts` or `raw`"
-      );
+  if (Array.isArray(perspective) && perspective.includes("raw"))
+    throw new TypeError(
+      'Invalid API perspective value: "raw". The raw-perspective can not be combined with other perspectives'
+    );
+  const invalid = (Array.isArray(perspective) ? perspective : [perspective]).filter(
+    (perspectiveName) => typeof perspectiveName != "string" || !VALID_PERSPECTIVE.test(perspectiveName)
+  );
+  if (invalid.length > 0) {
+    const formatted = invalid.map((v) => JSON.stringify(v));
+    throw new TypeError(
+      `Invalid API perspective value${invalid.length === 1 ? "" : "s"}: ${formatted.join(", ")}, expected \`published\`, \`drafts\`, \`raw\` or a release identifier string`
+    );
   }
 }
 const initConfig = (config, prevConfig) => {
@@ -507,9 +502,9 @@ class BasePatch {
   reset() {
     return this.operations = {}, this;
   }
-  _assign(op, props, merge = !0) {
+  _assign(op, props, merge2 = !0) {
     return validateObject(op, props), this.operations = Object.assign({}, this.operations, {
-      [op]: Object.assign({}, merge && this.operations[op] || {}, props)
+      [op]: Object.assign({}, merge2 && this.operations[op] || {}, props)
     }), this;
   }
   _set(op, props) {
@@ -1026,6 +1021,28 @@ function _listen(query, params, opts = {}) {
     )
   );
 }
+function shareReplayLatest(configOrPredicate, config) {
+  return _shareReplayLatest(
+    typeof configOrPredicate == "function" ? { predicate: configOrPredicate, ...config } : configOrPredicate
+  );
+}
+function _shareReplayLatest(config) {
+  return (source) => {
+    let latest, emitted = !1;
+    const { predicate, ...shareConfig } = config, wrapped = source.pipe(
+      tap((value) => {
+        config.predicate(value) && (emitted = !0, latest = value);
+      }),
+      finalize(() => {
+        emitted = !1, latest = void 0;
+      }),
+      share(shareConfig)
+    ), emitLatest = new Observable((subscriber) => {
+      emitted && subscriber.next(latest), subscriber.complete();
+    });
+    return merge(wrapped, emitLatest);
+  };
+}
 const requiredApiVersion = "2021-03-25";
 class LiveClient {
   #client;
@@ -1060,6 +1077,9 @@ class LiveClient {
     includeDrafts && token && (esOptions.headers = {
       Authorization: `Bearer ${token}`
     }), includeDrafts && withCredentials && (esOptions.withCredentials = !0);
+    const key = `${url.href}::${JSON.stringify(esOptions)}`, existing = eventsCache.get(key);
+    if (existing)
+      return existing;
     const events = connectEventSource(() => (
       // use polyfill if there is no global EventSource or if we need to set headers
       (typeof EventSource > "u" || esOptions.headers ? eventSourcePolyfill : of(EventSource)).pipe(map((EventSource2) => new EventSource2(url.href, esOptions)))
@@ -1087,8 +1107,13 @@ class LiveClient {
       catchError(() => {
         throw new CorsOriginError({ projectId: projectId2 });
       })
+    ), observable2 = concat(checkCors, events).pipe(
+      finalize$1(() => eventsCache.delete(key)),
+      shareReplayLatest({
+        predicate: (event) => event.type === "welcome"
+      })
     );
-    return concat(checkCors, events);
+    return eventsCache.set(key, observable2), observable2;
   }
 }
 function fetchObservable(url, init) {
@@ -1104,6 +1129,7 @@ function fetchObservable(url, init) {
     ), () => controller.abort();
   });
 }
+const eventsCache = /* @__PURE__ */ new Map();
 class ObservableDatasetsClient {
   #client;
   #httpRequest;