@sanity/client 4.0.0 → 4.0.1-1

package/lib/assets/assetsClient.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _observable = require("../util/observable");
 var _queryString = _interopRequireDefault(require("../http/queryString"));
 var validators = _interopRequireWildcard(require("../validators"));
+var _operators = require("rxjs/operators");
+var _rxjs = require("rxjs");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -99,11 +100,11 @@ _extends(AssetsClient.prototype, {
       query: query,
       body: body
     });
-    return this.client.isPromiseAPI() ? observable.pipe((0, _observable.filter)(function (event) {
+    return this.client.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(observable.pipe((0, _operators.filter)(function (event) {
       return event.type === 'response';
-    }), (0, _observable.map)(function (event) {
+    }), (0, _operators.map)(function (event) {
       return event.body.document;
-    })).toPromise() : observable;
+    }))) : observable;
   },
   delete: function _delete(type, id) {
     // eslint-disable-next-line no-console

package/lib/data/dataMethods.js

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _observable = require("../util/observable");
 var validators = _interopRequireWildcard(require("../validators"));
 var _getSelection = _interopRequireDefault(require("../util/getSelection"));
 var _encodeQueryString = _interopRequireDefault(require("./encodeQueryString"));
 var _transaction = _interopRequireDefault(require("./transaction"));
 var _patch = _interopRequireDefault(require("./patch"));
 var _listen = _interopRequireDefault(require("./listen"));
+var _operators = require("rxjs/operators");
+var _rxjs = require("rxjs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -46,9 +47,6 @@ var indexBy = function indexBy(docs, attr) {
     return indexed;
   }, Object.create(null));
 };
-var toPromise = function toPromise(observable) {
-  return observable.toPromise();
-};
 var getQuerySizeLimit = 11264;
 var _default = {
   listen: _listen.default,
@@ -69,8 +67,8 @@ var _default = {
     var observable = this._dataRequest('query', {
       query: query,
       params: params
-    }, options).pipe((0, _observable.map)(mapResponse));
-    return this.isPromiseAPI() ? toPromise(observable) : observable;
+    }, options).pipe((0, _operators.map)(mapResponse));
+    return this.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(observable) : observable;
   },
   getDocument: function getDocument(id) {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -79,10 +77,10 @@ var _default = {
       json: true,
       tag: opts.tag
     };
-    var observable = this._requestObservable(options).pipe((0, _observable.filter)(isResponse), (0, _observable.map)(function (event) {
+    var observable = this._requestObservable(options).pipe((0, _operators.filter)(isResponse), (0, _operators.map)(function (event) {
       return event.body.documents && event.body.documents[0];
     }));
-    return this.isPromiseAPI() ? toPromise(observable) : observable;
+    return this.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(observable) : observable;
   },
   getDocuments: function getDocuments(ids) {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -91,7 +89,7 @@ var _default = {
       json: true,
       tag: opts.tag
     };
-    var observable = this._requestObservable(options).pipe((0, _observable.filter)(isResponse), (0, _observable.map)(function (event) {
+    var observable = this._requestObservable(options).pipe((0, _operators.filter)(isResponse), (0, _operators.map)(function (event) {
       var indexed = indexBy(event.body.documents || [], function (doc) {
         return doc._id;
       });
@@ -99,7 +97,7 @@ var _default = {
         return indexed[id] || null;
       });
     }));
-    return this.isPromiseAPI() ? toPromise(observable) : observable;
+    return this.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(observable) : observable;
   },
   create: function create(doc, options) {
     return this._create(doc, 'create', options);
@@ -137,7 +135,7 @@ var _default = {
   dataRequest: function dataRequest(endpoint, body) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var request = this._dataRequest(endpoint, body, options);
-    return this.isPromiseAPI() ? toPromise(request) : request;
+    return this.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(request) : request;
   },
   _dataRequest: function _dataRequest(endpoint, body) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -167,7 +165,7 @@ var _default = {
       tag: tag,
       canUseCdn: isQuery
     };
-    return this._requestObservable(reqOptions).pipe((0, _observable.filter)(isResponse), (0, _observable.map)(getBody), (0, _observable.map)(function (res) {
+    return this._requestObservable(reqOptions).pipe((0, _operators.filter)(isResponse), (0, _operators.map)(getBody), (0, _operators.map)(function (res) {
       if (!isMutation) {
         return res;
       }

package/lib/data/listen.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = listen;
-var _observable = require("../util/observable");
 var _eventsource = _interopRequireDefault(require("@sanity/eventsource"));
 var _pick = _interopRequireDefault(require("../util/pick"));
 var _defaults = _interopRequireDefault(require("../util/defaults"));
 var _encodeQueryString = _interopRequireDefault(require("./encodeQueryString"));
+var _rxjs = require("rxjs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -46,7 +46,7 @@ function listen(query, params) {
   });
   var uri = "".concat(url).concat(this.getDataUrl('listen', qs));
   if (uri.length > MAX_URL_LENGTH) {
-    return new _observable.Observable(function (observer) {
+    return new _rxjs.Observable(function (observer) {
       return observer.error(new Error('Query too large for listener'));
     });
   }
@@ -61,7 +61,7 @@ function listen(query, params) {
       Authorization: "Bearer ".concat(token)
     };
   }
-  return new _observable.Observable(function (observer) {
+  return new _rxjs.Observable(function (observer) {
     var es = getEventSource();
     var reconnectTimer;
     var stopped = false;

package/lib/http/request.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _getIt = _interopRequireDefault(require("get-it"));
 var _middleware = require("get-it/middleware");
-var _observable = require("../util/observable");
 var _errors = require("./errors");
 var _nodeMiddleware = _interopRequireDefault(require("./nodeMiddleware"));
+var _rxjs = require("rxjs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 var httpError = {
@@ -35,7 +35,7 @@ var printWarnings = {
 // Environment-specific middleware.
 var envSpecific = _nodeMiddleware.default;
 var middleware = envSpecific.concat([printWarnings, (0, _middleware.jsonRequest)(), (0, _middleware.jsonResponse)(), (0, _middleware.progress)(), httpError, (0, _middleware.observable)({
-  implementation: _observable.Observable
+  implementation: _rxjs.Observable
 })]);
 var request = (0, _getIt.default)(middleware);
 function httpRequest(options) {

package/lib/sanityClient.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _observable = require("./util/observable");
 var _patch = _interopRequireDefault(require("./data/patch"));
 var _transaction = _interopRequireDefault(require("./data/transaction"));
 var _dataMethods = _interopRequireDefault(require("./data/dataMethods"));
@@ -18,6 +17,8 @@ var _request = _interopRequireDefault(require("./http/request"));
 var _requestOptions = _interopRequireDefault(require("./http/requestOptions"));
 var _config = require("./config");
 var validate = _interopRequireWildcard(require("./validators"));
+var _rxjs = require("rxjs");
+var _operators = require("rxjs/operators");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -27,9 +28,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-var toPromise = function toPromise(observable) {
-  return observable.toPromise();
-};
 function SanityClient() {
   var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _config.defaultConfig;
   if (!(this instanceof SanityClient)) {
@@ -97,17 +95,17 @@ _extends(SanityClient.prototype, {
     var reqOptions = (0, _requestOptions.default)(this.clientConfig, _extends({}, options, {
       url: this.getUrl(uri, useCdn)
     }));
-    return new _observable.Observable(function (subscriber) {
+    return new _rxjs.Observable(function (subscriber) {
       return (0, _request.default)(reqOptions, _this.clientConfig.requester).subscribe(subscriber);
     });
   },
   request: function request(options) {
-    var observable = this._requestObservable(options).pipe((0, _observable.filter)(function (event) {
+    var observable = this._requestObservable(options).pipe((0, _operators.filter)(function (event) {
       return event.type === 'response';
-    }), (0, _observable.map)(function (event) {
+    }), (0, _operators.map)(function (event) {
       return event.body;
     }));
-    return this.isPromiseAPI() ? toPromise(observable) : observable;
+    return this.isPromiseAPI() ? (0, _rxjs.lastValueFrom)(observable) : observable;
   }
 });
 SanityClient.Patch = _patch.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "4.0.0",
+  "version": "4.0.1-1",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "type": "commonjs",
   "main": "index.js",
@@ -25,9 +25,9 @@
     "sanityClient.d.ts"
   ],
   "scripts": {
-    "browserify": "NODE_ENV=production BROWSERIFY_ENV=build DEBUG='' browserify -t envify -g uglifyify lib/sanityClient.js -o umd/sanityClient.js --standalone=SanityClient",
+    "rollup": "NODE_ENV=production rollup -c rollup.config.js",
     "compile": "babel -d lib src",
-    "build": "npm run compile && npm run browserify && npm run minify && npm run esbuild:browser",
+    "build": "npm run compile && npm run rollup && npm run minify && npm run esbuild:browser",
     "esbuild": "esbuild src/sanityClient.js --bundle --sourcemap --external:get-it",
     "esbuild-when-upstream-deps-works-in-deno-cloudflare-and-vercel": "esbuild src/sanityClient.js --bundle --sourcemap --external:rxjs --external:@sanity/eventsource --external:get-it --external:make-error",
     "esbuild:browser": "npm run esbuild -- --format=esm --outfile=dist/sanityClient.browser.mjs --platform=browser",
@@ -53,20 +53,20 @@
     "@sanity/eventsource": "^4.0.0",
     "get-it": "^7.0.2",
     "make-error": "^1.3.6",
-    "rxjs": "^6.6.7"
+    "rxjs": "^7.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.7",
     "@babel/plugin-transform-object-assign": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
+    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
     "@sanity/semantic-release-preset": "^2.0.5",
     "@types/node": "^18.11.18",
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-tape-runner": "^3.0.0",
-    "browserify": "^17.0.0",
-    "envify": "^4.1.0",
     "esbuild": "^0.16.12",
     "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
@@ -75,11 +75,11 @@
     "nyc": "^15.1.0",
     "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
+    "rollup": "^3.9.1",
     "sse-channel": "^4.0.0",
     "tape": "^5.6.1",
     "terser": "^5.16.1",
     "typescript": "^4.9.4",
-    "uglifyify": "^5.0.2",
     "xtend": "4.0.2"
   },
   "repository": {

package/sanityClient.d.ts

@@ -944,7 +944,7 @@ export class ObservableSanityClient {
      */
     upload(
       assetType: 'file' | 'image',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Observable<
       ResponseEvent<{document: SanityAssetDocument | SanityImageAssetDocument}> | ProgressEvent
@@ -959,7 +959,7 @@ export class ObservableSanityClient {
      */
     upload(
       assetType: 'file',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Observable<ResponseEvent<{document: SanityAssetDocument}> | ProgressEvent>
 
@@ -972,7 +972,7 @@ export class ObservableSanityClient {
      */
     upload(
       assetType: 'image',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Observable<ResponseEvent<{document: SanityImageAssetDocument}> | ProgressEvent>
 
@@ -1609,7 +1609,7 @@ export interface SanityClient {
      */
     upload(
       assetType: 'file' | 'image',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Promise<SanityAssetDocument | SanityImageAssetDocument>
 
@@ -1622,7 +1622,7 @@ export interface SanityClient {
      */
     upload(
       assetType: 'file',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Promise<SanityAssetDocument>
 
@@ -1635,7 +1635,7 @@ export interface SanityClient {
      */
     upload(
       assetType: 'image',
-      body: File | Blob | Buffer | ReadableStream,
+      body: File | Blob | Buffer | NodeJS.ReadableStream,
       options?: UploadOptions
     ): Promise<SanityImageAssetDocument>