@sanity/client 0.0.0-dev.3 → 0.0.0-dev.5

package/dist/index.cjs

@@ -7,15 +7,8 @@ var middleware$1 = require('get-it/middleware');
 var getIt = require('get-it');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
-var polyfilledEventSource = require('@sanity/eventsource');
-function _interopDefaultCompat(e) {
-  return e && typeof e === 'object' && 'default' in e ? e : {
-    default: e
-  };
-}
-var polyfilledEventSource__default = /*#__PURE__*/_interopDefaultCompat(polyfilledEventSource);
 var name = "@sanity/client";
-var version = "0.0.0-dev.3";
+var version = "0.0.0-dev.5";
 const middleware = [middleware$1.debug({
   verbose: true,
   namespace: "sanity:client"
@@ -24,6 +17,7 @@ const middleware = [middleware$1.debug({
 }), middleware$1.retry({
   maxRetries: 3
 })];
+const MAX_ITEMS_IN_ERROR_MESSAGE = 5;
 class ClientError extends Error {
   constructor(res) {
     const props = extractErrorProps(res);
@@ -53,6 +47,20 @@ function extractErrorProps(res) {
     props.message = "".concat(body.error, " - ").concat(body.message);
     return props;
   }
+  if (isMutationError(body)) {
+    const allItems = body.error.items || [];
+    const items = allItems.slice(0, MAX_ITEMS_IN_ERROR_MESSAGE).map(item => {
+      var _a;
+      return (_a = item.error) == null ? void 0 : _a.description;
+    }).filter(Boolean);
+    let itemsStr = items.length ? ":\n- ".concat(items.join("\n- ")) : "";
+    if (allItems.length > MAX_ITEMS_IN_ERROR_MESSAGE) {
+      itemsStr += "\n...and ".concat(allItems.length - MAX_ITEMS_IN_ERROR_MESSAGE, " more");
+    }
+    props.message = "".concat(body.error.description).concat(itemsStr);
+    props.details = body.error;
+    return props;
+  }
   if (body.error && body.error.description) {
     props.message = body.error.description;
     props.details = body.error;
@@ -61,6 +69,12 @@ function extractErrorProps(res) {
   props.message = body.error || body.message || httpErrorMessage(res);
   return props;
 }
+function isMutationError(body) {
+  return isPlainObject(body) && isPlainObject(body.error) && body.error.type === "mutationError" && typeof body.error.description === "string";
+}
+function isPlainObject(obj) {
+  return typeof obj === "object" && obj !== null && !Array.isArray(obj);
+}
 function httpErrorMessage(res) {
   const statusMessage = res.statusMessage ? " ".concat(res.statusMessage) : "";
   return "".concat(res.method, "-request to ").concat(res.url, " resulted in HTTP ").concat(res.statusCode).concat(statusMessage);
@@ -163,7 +177,7 @@ const validateObject = (op, val) => {
   }
 };
 const validateDocumentId = (op, id) => {
-  if (typeof id !== "string" || !/^[a-z0-9_.-]+$/i.test(id)) {
+  if (typeof id !== "string" || !/^[a-z0-9_][a-z0-9_.-]{0,127}$/i.test(id) || id.includes("..")) {
     throw new Error("".concat(op, "(): \"").concat(id, "\" is not a valid document ID"));
   }
 };
@@ -680,23 +694,9 @@ const indexBy = (docs, attr) => docs.reduce((indexed, doc) => {
   return indexed;
 }, /* @__PURE__ */Object.create(null));
 const getQuerySizeLimit = 11264;
-function _fetch(client, httpRequest, query, _params) {
+function _fetch(client, httpRequest, query, params) {
   let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   const mapResponse = options.filterResponse === false ? res => res : res => res.result;
-  let params = _params;
-  const {
-    unstable_overlayDrafts,
-    apiVersion
-  } = client.config();
-  if (unstable_overlayDrafts) {
-    if (apiVersion !== "X") {
-      console.error("You need to set `apiVersion` to `X` to use `unstable_overlayDrafts");
-    }
-    params = {
-      ...params,
-      draftMode: true
-    };
-  }
   return _dataRequest(client, httpRequest, "query", {
     query,
     params
@@ -817,6 +817,12 @@ function _requestObservable(client, httpRequest, options) {
       ...options.query
     };
   }
+  if (config.resultSourceMap) {
+    options.query = {
+      resultSourceMap: true,
+      ...options.query
+    };
+  }
   const reqOptions = requestOptions(config, Object.assign({}, options, {
     url: _getUrl(client, uri, useCdn)
   }));
@@ -961,7 +967,7 @@ function _upload(client, httpRequest, assetType, body) {
   });
 }
 function optionsFromFile(opts, file) {
-  if (typeof window === "undefined" || !(file instanceof window.File)) {
+  if (typeof File === "undefined" || !(file instanceof File)) {
     return opts;
   }
   return Object.assign({
@@ -1074,7 +1080,6 @@ const pick = (obj, props) => props.reduce((selection, prop) => {
   return selection;
 }, {});
 const MAX_URL_LENGTH = 16e3 - 1200;
-const EventSource = polyfilledEventSource__default.default;
 const possibleOptions = ["includePreviousRevision", "includeResult", "visibility", "effectFormat", "tag"];
 const defaultOptions = {
   includeResult: true
@@ -1117,7 +1122,13 @@ function _listen(query, params) {
     };
   }
   return new rxjs.Observable(observer => {
-    let es = getEventSource();
+    let es;
+    getEventSource().then(eventSource => {
+      es = eventSource;
+    }).catch(reason => {
+      observer.error(reason);
+      stop();
+    });
     let reconnectTimer;
     let stopped = false;
     function onError() {
@@ -1128,7 +1139,7 @@ function _listen(query, params) {
       if (stopped) {
         return;
       }
-      if (es.readyState === EventSource.CLOSED) {
+      if (es.readyState === es.CLOSED) {
         unsubscribe();
         clearTimeout(reconnectTimer);
         reconnectTimer = setTimeout(open, 100);
@@ -1147,10 +1158,11 @@ function _listen(query, params) {
       observer.complete();
     }
     function unsubscribe() {
-      es.removeEventListener("error", onError, false);
-      es.removeEventListener("channelError", onChannelError, false);
-      es.removeEventListener("disconnect", onDisconnect, false);
-      listenFor.forEach(type => es.removeEventListener(type, onMessage, false));
+      if (!es) return;
+      es.removeEventListener("error", onError);
+      es.removeEventListener("channelError", onChannelError);
+      es.removeEventListener("disconnect", onDisconnect);
+      listenFor.forEach(type => es.removeEventListener(type, onMessage));
       es.close();
     }
     function emitReconnect() {
@@ -1160,16 +1172,24 @@ function _listen(query, params) {
         });
       }
     }
-    function getEventSource() {
+    async function getEventSource() {
+      const {
+        default: EventSource
+      } = await import('@sanity/eventsource');
       const evs = new EventSource(uri, esOptions);
-      evs.addEventListener("error", onError, false);
-      evs.addEventListener("channelError", onChannelError, false);
-      evs.addEventListener("disconnect", onDisconnect, false);
-      listenFor.forEach(type => evs.addEventListener(type, onMessage, false));
+      evs.addEventListener("error", onError);
+      evs.addEventListener("channelError", onChannelError);
+      evs.addEventListener("disconnect", onDisconnect);
+      listenFor.forEach(type => evs.addEventListener(type, onMessage));
       return evs;
     }
     function open() {
-      es = getEventSource();
+      getEventSource().then(eventSource => {
+        es = eventSource;
+      }).catch(reason => {
+        observer.error(reason);
+        stop();
+      });
     }
     function stop() {
       stopped = true;
@@ -1758,6 +1778,18 @@ function deprecatedCreateClient(config) {
   printNoDefaultExport();
   return new SanityClient(httpRequest, config);
 }
+Object.defineProperty(exports, 'unstable__adapter', {
+  enumerable: true,
+  get: function () {
+    return getIt.adapter;
+  }
+});
+Object.defineProperty(exports, 'unstable__environment', {
+  enumerable: true,
+  get: function () {
+    return getIt.environment;
+  }
+});
 exports.BasePatch = BasePatch;
 exports.BaseTransaction = BaseTransaction;
 exports.ClientError = ClientError;

package/dist/index.cjs.js

@@ -1,5 +1,7 @@
 import cjs from './index.cjs';
 
+export const unstable__adapter = cjs.unstable__adapter;
+export const unstable__environment = cjs.unstable__environment;
 export const BasePatch = cjs.BasePatch;
 export const BaseTransaction = cjs.BaseTransaction;
 export const ClientError = cjs.ClientError;