@sanity/client 6.17.1-canary.0 → 6.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "6.17.1-canary.0",
+  "version": "6.17.1",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "keywords": [
     "sanity",
@@ -118,7 +118,7 @@
   },
   "dependencies": {
     "@sanity/eventsource": "^5.0.2",
-    "get-it": "^8.4.27",
+    "get-it": "^8.4.28",
     "rxjs": "^7.0.0"
   },
   "devDependencies": {
@@ -131,7 +131,7 @@
     "@types/node": "^20.8.8",
     "@typescript-eslint/eslint-plugin": "^7.8.0",
     "@typescript-eslint/parser": "^7.8.0",
-    "@vercel/stega": "0.1.1",
+    "@vercel/stega": "0.1.2",
     "@vitest/coverage-v8": "1.5.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",

package/src/SanityClient.ts

@@ -5,7 +5,6 @@ import {defaultConfig, initConfig} from './config'
 import * as dataMethods from './data/dataMethods'
 import {_listen} from './data/listen'
 import {ObservablePatch, Patch} from './data/patch'
-import {_syncTags} from './data/syncTags'
 import {ObservableTransaction, Transaction} from './data/transaction'
 import {DatasetsClient, ObservableDatasetsClient} from './datasets/DatasetsClient'
 import {ObservableProjectsClient, ProjectsClient} from './projects/ProjectsClient'
@@ -42,7 +41,6 @@ import {ObservableUsersClient, UsersClient} from './users/UsersClient'
 
 export type {
   _listen,
-  _syncTags,
   AssetsClient,
   DatasetsClient,
   ObservableAssetsClient,
@@ -70,7 +68,6 @@ export class ObservableSanityClient {
    * Instance properties
    */
   listen = _listen
-  syncTags = _syncTags
 
   constructor(httpRequest: HttpRequest, config: ClientConfig = defaultConfig) {
     this.config(config)
@@ -716,7 +713,6 @@ export class SanityClient {
    * Instance properties
    */
   listen = _listen
-  syncTags = _syncTags
 
   constructor(httpRequest: HttpRequest, config: ClientConfig = defaultConfig) {
     this.config(config)

package/src/data/listen.ts

@@ -85,16 +85,13 @@ export function _listen<R extends Record<string, Any> = Record<string, Any>>(
 
   return new Observable((observer) => {
     let es: InstanceType<typeof import('@sanity/eventsource')>
-    getEventSource()
-      .then((eventSource) => {
-        es = eventSource
-      })
-      .catch((reason) => {
-        observer.error(reason)
-        stop()
-      })
     let reconnectTimer: NodeJS.Timeout
     let stopped = false
+    // Unsubscribe differs from stopped in that we will never reopen.
+    // Once it is`true`, it will never be `false` again.
+    let unsubscribed = false
+
+    open()
 
     function onError() {
       if (stopped) {
@@ -150,8 +147,17 @@ export function _listen<R extends Record<string, Any> = Record<string, Any>>(
       }
     }
 
-    async function getEventSource(): Promise<InstanceType<typeof import('@sanity/eventsource')>> {
+    async function getEventSource(): Promise<InstanceType<
+      typeof import('@sanity/eventsource')
+    > | void> {
       const {default: EventSource} = await import('@sanity/eventsource')
+
+      // If the listener has been unsubscribed from before we managed to load the module,
+      // do not set up the EventSource.
+      if (unsubscribed) {
+        return
+      }
+
       const evs = new EventSource(uri, esOptions)
       evs.addEventListener('error', onError)
       evs.addEventListener('channelError', onChannelError)
@@ -163,7 +169,9 @@ export function _listen<R extends Record<string, Any> = Record<string, Any>>(
     function open() {
       getEventSource()
         .then((eventSource) => {
-          es = eventSource
+          if (eventSource) {
+            es = eventSource
+          }
         })
         .catch((reason) => {
           observer.error(reason)
@@ -174,6 +182,7 @@ export function _listen<R extends Record<string, Any> = Record<string, Any>>(
     function stop() {
       stopped = true
       unsubscribe()
+      unsubscribed = true
     }
 
     return stop

package/src/types.ts

@@ -785,7 +785,6 @@ export interface RawQueryResponse<R> {
   ms: number
   result: R
   resultSourceMap?: ContentSourceMap
-  syncTags?: `s1:${string}`[]
 }
 
 /** @public */
@@ -1000,26 +999,6 @@ export interface ContentSourceMap {
   paths: ContentSourceMapPaths
 }
 
-/** @public */
-export interface SyncTagsOptions {
-  pos?: string
-}
-/** @public */
-export interface SyncTagsErrorEvent {
-  type: 'error'
-  status: number
-  message: string
-}
-/** @public */
-export interface SyncTagsRestartEvent {
-  type: 'restart'
-}
-/** @public */
-export interface SyncTagsChangeEvent {
-  tags: `s1:${string}`[]
-  pos: string
-}
-
 export type {
   ContentSourceMapParsedPath,
   ContentSourceMapParsedPathKeyedSegment,

package/umd/sanityClient.js

@@ -28,9 +28,9 @@
     const qIndex = url.indexOf("?");
     if (qIndex === -1)
       return { url, searchParams: new URLSearchParams() };
-    const base = url.slice(0, qIndex), qs = url.slice(qIndex + 1), searchParams = new URLSearchParams(qs);
-    if (typeof searchParams.set == "function")
-      return { url: base, searchParams };
+    const base = url.slice(0, qIndex), qs = url.slice(qIndex + 1);
+    if (!isReactNative)
+      return { url: base, searchParams: new URLSearchParams(qs) };
     if (typeof decodeURIComponent != "function")
       throw new Error(
         "Broken `URLSearchParams` implementation, and `decodeURIComponent` is not defined"
@@ -1778,10 +1778,10 @@
       return combineLatest.apply(void 0, __spreadArray([], __read(otherSources)));
   }
 
-  var s = { 0: 8203, 1: 8204, 2: 8205, 3: 8290, 4: 8291, 5: 8288, 6: 65279, 7: 8289, 8: 119155, 9: 119156, a: 119157, b: 119158, c: 119159, d: 119160, e: 119161, f: 119162 }, c = { 0: 8203, 1: 8204, 2: 8205, 3: 65279 }, d = new Array(4).fill(String.fromCodePoint(c[0])).join("");
+  var s = { 0: 8203, 1: 8204, 2: 8205, 3: 8290, 4: 8291, 5: 8288, 6: 65279, 7: 8289, 8: 119155, 9: 119156, a: 119157, b: 119158, c: 119159, d: 119160, e: 119161, f: 119162 }, c = { 0: 8203, 1: 8204, 2: 8205, 3: 65279 }, u = new Array(4).fill(String.fromCodePoint(c[0])).join("");
   function E(t) {
     let e = JSON.stringify(t);
-    return `${d}${Array.from(e).map((r) => {
+    return `${u}${Array.from(e).map((r) => {
     let n = r.charCodeAt(0);
     if (n > 255)
       throw new Error(`Only ASCII edit info can be encoded. Error attempting to encode ${e} on character ${r} (${n})`);
@@ -1789,9 +1789,9 @@
   }).join("")}`;
   }
   function I(t) {
-    return Number.isNaN(Number(t)) ? !!Date.parse(t) : !1;
+    return !Number.isNaN(Number(t)) || /[a-z]/i.test(t) && !/\d+(?:[-:\/]\d+){2}(?:T\d+(?:[-:\/]\d+){1,2}(\.\d+)?Z?)?/.test(t) ? !1 : !!Date.parse(t);
   }
-  function x(t) {
+  function T(t) {
     try {
       new URL(t, t.startsWith("/") ? "https://acme.com" : void 0);
     } catch {
@@ -1800,17 +1800,17 @@
     return !0;
   }
   function C(t, e, r = "auto") {
-    return r === !0 || r === "auto" && (I(t) || x(t)) ? t : `${t}${E(e)}`;
+    return r === !0 || r === "auto" && (I(t) || T(t)) ? t : `${t}${E(e)}`;
   }
   Object.fromEntries(Object.entries(c).map((t) => t.reverse()));
   Object.fromEntries(Object.entries(s).map((t) => t.reverse()));
-  var T = `${Object.values(s).map((t) => `\\u{${t.toString(16)}}`).join("")}`, f = new RegExp(`[${T}]{4,}`, "gu");
+  var S = `${Object.values(s).map((t) => `\\u{${t.toString(16)}}`).join("")}`, f = new RegExp(`[${S}]{4,}`, "gu");
   function _(t) {
     var e;
     return { cleaned: t.replace(f, ""), encoded: ((e = t.match(f)) == null ? void 0 : e[0]) || "" };
   }
   function O(t) {
-    return JSON.parse(_(JSON.stringify(t)).cleaned);
+    return t && JSON.parse(_(JSON.stringify(t)).cleaned);
   }
   function stegaClean(result) {
     try {
@@ -2672,13 +2672,8 @@ ${selectionOpts}`);
     return (token || withCredentials) && (esOptions.withCredentials = !0), token && (esOptions.headers = {
       Authorization: `Bearer ${token}`
     }), new Observable((observer) => {
-      let es;
-      getEventSource().then((eventSource) => {
-        es = eventSource;
-      }).catch((reason) => {
-        observer.error(reason), stop();
-      });
-      let reconnectTimer, stopped = !1;
+      let es, reconnectTimer, stopped = !1, unsubscribed = !1;
+      open();
       function onError() {
         stopped || (emitReconnect(), !stopped && es.readyState === es.CLOSED && (unsubscribe(), clearTimeout(reconnectTimer), reconnectTimer = setTimeout(open, 100)));
       }
@@ -2699,18 +2694,21 @@ ${selectionOpts}`);
         shouldEmitReconnect && observer.next({ type: "reconnect" });
       }
       async function getEventSource() {
-        const { default: EventSource } = await Promise.resolve().then(function () { return browser$2; }), evs = new EventSource(uri, esOptions);
+        const { default: EventSource } = await Promise.resolve().then(function () { return browser$2; });
+        if (unsubscribed)
+          return;
+        const evs = new EventSource(uri, esOptions);
         return evs.addEventListener("error", onError), evs.addEventListener("channelError", onChannelError), evs.addEventListener("disconnect", onDisconnect), listenFor.forEach((type) => evs.addEventListener(type, onMessage)), evs;
       }
       function open() {
         getEventSource().then((eventSource) => {
-          es = eventSource;
+          eventSource && (es = eventSource);
         }).catch((reason) => {
           observer.error(reason), stop();
         });
       }
       function stop() {
-        stopped = !0, unsubscribe();
+        stopped = !0, unsubscribe(), unsubscribed = !0;
       }
       return stop;
     });
@@ -2732,57 +2730,6 @@ ${selectionOpts}`);
   function extractErrorMessage(err) {
     return err.error ? err.error.description ? err.error.description : typeof err.error == "string" ? err.error : JSON.stringify(err.error, null, 2) : err.message || "Unknown listener error";
   }
-  function _syncTags(opts = {}) {
-    const path = _getDataUrl(this, "sync-tags"), url = new URL(this.getUrl(path, !0));
-    return opts.pos && url.searchParams.append("start", opts.pos), new Observable((observer) => {
-      const controller = new AbortController(), { signal } = controller;
-      return fetch(url, { signal }).then(async (res) => {
-        if (!res.body)
-          throw new TypeError("Response body is not readable");
-        const reader = res.body.pipeThrough(new TextDecoderStream()).pipeThrough(splitStream(`
-`)).pipeThrough(parseJSON()).getReader(), results = {
-          [Symbol.asyncIterator]() {
-            return {
-              next: () => reader.read()
-            };
-          }
-        };
-        for await (const chunk of results) {
-          if (signal.aborted)
-            break;
-          if (chunk.type === "error") {
-            observer.error(chunk);
-            break;
-          }
-          observer.next(chunk);
-        }
-      }).catch((err) => {
-        (err == null ? void 0 : err.name) !== "TimeoutError" && (err == null ? void 0 : err.name) !== "AbortError" && observer.error(err);
-      }), () => {
-        controller.abort();
-      };
-    });
-  }
-  function splitStream(splitOn) {
-    let buffer = "";
-    return new TransformStream({
-      transform(chunk, controller) {
-        buffer += chunk;
-        const parts = buffer.split(splitOn);
-        parts.slice(0, -1).forEach((part) => controller.enqueue(part)), buffer = parts[parts.length - 1];
-      },
-      flush(controller) {
-        buffer && controller.enqueue(buffer);
-      }
-    });
-  }
-  function parseJSON() {
-    return new TransformStream({
-      transform(chunk, controller) {
-        chunk && controller.enqueue(JSON.parse(chunk));
-      }
-    });
-  }
   var __accessCheck$3 = (obj, member, msg) => {
     if (!member.has(obj))
       throw TypeError("Cannot " + msg);
@@ -2987,7 +2934,7 @@ ${selectionOpts}`);
   }, __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value), _clientConfig, _httpRequest;
   const _ObservableSanityClient = class _ObservableSanityClient2 {
     constructor(httpRequest, config = defaultConfig) {
-      __publicField(this, "assets"), __publicField(this, "datasets"), __publicField(this, "projects"), __publicField(this, "users"), __privateAdd(this, _clientConfig, void 0), __privateAdd(this, _httpRequest, void 0), __publicField(this, "listen", _listen), __publicField(this, "syncTags", _syncTags), this.config(config), __privateSet(this, _httpRequest, httpRequest), this.assets = new ObservableAssetsClient(this, __privateGet(this, _httpRequest)), this.datasets = new ObservableDatasetsClient(this, __privateGet(this, _httpRequest)), this.projects = new ObservableProjectsClient(this, __privateGet(this, _httpRequest)), this.users = new ObservableUsersClient(this, __privateGet(this, _httpRequest));
+      __publicField(this, "assets"), __publicField(this, "datasets"), __publicField(this, "projects"), __publicField(this, "users"), __privateAdd(this, _clientConfig, void 0), __privateAdd(this, _httpRequest, void 0), __publicField(this, "listen", _listen), this.config(config), __privateSet(this, _httpRequest, httpRequest), this.assets = new ObservableAssetsClient(this, __privateGet(this, _httpRequest)), this.datasets = new ObservableDatasetsClient(this, __privateGet(this, _httpRequest)), this.projects = new ObservableProjectsClient(this, __privateGet(this, _httpRequest)), this.users = new ObservableUsersClient(this, __privateGet(this, _httpRequest));
     }
     /**
      * Clone the client - returns a new instance
@@ -3116,7 +3063,7 @@ ${selectionOpts}`);
   var _clientConfig2, _httpRequest2;
   const _SanityClient = class _SanityClient2 {
     constructor(httpRequest, config = defaultConfig) {
-      __publicField(this, "assets"), __publicField(this, "datasets"), __publicField(this, "projects"), __publicField(this, "users"), __publicField(this, "observable"), __privateAdd(this, _clientConfig2, void 0), __privateAdd(this, _httpRequest2, void 0), __publicField(this, "listen", _listen), __publicField(this, "syncTags", _syncTags), this.config(config), __privateSet(this, _httpRequest2, httpRequest), this.assets = new AssetsClient(this, __privateGet(this, _httpRequest2)), this.datasets = new DatasetsClient(this, __privateGet(this, _httpRequest2)), this.projects = new ProjectsClient(this, __privateGet(this, _httpRequest2)), this.users = new UsersClient(this, __privateGet(this, _httpRequest2)), this.observable = new ObservableSanityClient(httpRequest, config);
+      __publicField(this, "assets"), __publicField(this, "datasets"), __publicField(this, "projects"), __publicField(this, "users"), __publicField(this, "observable"), __privateAdd(this, _clientConfig2, void 0), __privateAdd(this, _httpRequest2, void 0), __publicField(this, "listen", _listen), this.config(config), __privateSet(this, _httpRequest2, httpRequest), this.assets = new AssetsClient(this, __privateGet(this, _httpRequest2)), this.datasets = new DatasetsClient(this, __privateGet(this, _httpRequest2)), this.projects = new ProjectsClient(this, __privateGet(this, _httpRequest2)), this.users = new UsersClient(this, __privateGet(this, _httpRequest2)), this.observable = new ObservableSanityClient(httpRequest, config);
     }
     /**
      * Clone the client - returns a new instance