@sanity/client 6.28.3-resources.0 → 6.28.3-resources.1

package/package.json

@@ -1,17 +1,8 @@
 {
   "name": "@sanity/client",
-  "version": "6.28.3-resources.0",
+  "version": "6.28.3-resources.1",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
-  "keywords": [
-    "sanity",
-    "cms",
-    "headless",
-    "realtime",
-    "content",
-    "client",
-    "fetch",
-    "api"
-  ],
+  "keywords": ["sanity", "cms", "headless", "realtime", "content", "client", "fetch", "api"],
   "homepage": "https://www.sanity.io/",
   "bugs": {
     "url": "https://github.com/sanity-io/client/issues"
@@ -75,19 +66,11 @@
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
-      "csm": [
-        "./dist/csm.d.ts"
-      ],
-      "stega": [
-        "./dist/stega.d.ts"
-      ]
+      "csm": ["./dist/csm.d.ts"],
+      "stega": ["./dist/stega.d.ts"]
     }
   },
-  "files": [
-    "dist",
-    "src",
-    "umd"
-  ],
+  "files": ["dist", "src", "umd"],
   "scripts": {
     "benchmark": "npm test -- bench",
     "prebuild": "npm run clean",
@@ -110,9 +93,7 @@
   "browserslist": "extends @sanity/browserslist-config",
   "prettier": {
     "bracketSpacing": false,
-    "plugins": [
-      "prettier-plugin-packagejson"
-    ],
+    "plugins": ["prettier-plugin-packagejson"],
     "printWidth": 100,
     "semi": false,
     "singleQuote": true

package/src/data/dataMethods.ts

@@ -367,36 +367,34 @@ export function _create<R extends Record<string, Any>>(
   const opts = Object.assign({returnFirst: true, returnDocuments: true}, options)
   return _dataRequest(client, httpRequest, 'mutate', {mutations: [mutation]}, opts)
 }
-const isQuery = (config: ClientConfig, uri: string) =>
-  uri.startsWith('/data/query/') ||
-  (config['~experimental_resource'] &&
+const resourceDatasetRegex = /^\/projects\/([^/]+)\/datasets\/([^/]+)\/([^/^?]+)\/?/
+const isResourceDataEndpoint = (config: ClientConfig, uri: string, endpoint: string) => {
+  if (!config['~experimental_resource']) {
+    return false
+  }
+  if (
     uri.startsWith(
-      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/query`,
-    ))
+      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/${endpoint}`,
+    )
+  ) {
+    return true
+  }
+  const match = uri.match(resourceDatasetRegex)
+  if (!match) {
+    return false
+  }
+  return match[3] === endpoint
+}
+const isQuery = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/query/') || isResourceDataEndpoint(config, uri, 'query')
 const isMutate = (config: ClientConfig, uri: string) =>
-  uri.startsWith('/data/mutate/') ||
-  (config['~experimental_resource'] &&
-    uri.startsWith(
-      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/mutate`,
-    ))
+  uri.startsWith('/data/mutate/') || isResourceDataEndpoint(config, uri, 'mutate')
 const isDoc = (config: ClientConfig, uri: string) =>
-  uri.startsWith('/data/doc/') ||
-  (config['~experimental_resource'] &&
-    uri.startsWith(
-      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/doc/`,
-    ))
+  uri.startsWith('/data/doc/') || isResourceDataEndpoint(config, uri, 'doc')
 const isListener = (config: ClientConfig, uri: string) =>
-  uri.startsWith('/data/listen/') ||
-  (config['~experimental_resource'] &&
-    uri.startsWith(
-      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/listen`,
-    ))
+  uri.startsWith('/data/listen/') || isResourceDataEndpoint(config, uri, 'listen')
 const isHistory = (config: ClientConfig, uri: string) =>
-  uri.startsWith('/data/history/') ||
-  (config['~experimental_resource'] &&
-    uri.startsWith(
-      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/history/`,
-    ))
+  uri.startsWith('/data/history/') || isResourceDataEndpoint(config, uri, 'history')
 const isData = (config: ClientConfig, uri: string) =>
   uri.startsWith('/data/') ||
   isQuery(config, uri) ||

package/umd/sanityClient.js

@@ -2779,17 +2779,16 @@ ${selectionOpts}`);
     const mutation = { [op]: doc }, opts = Object.assign({ returnFirst: true, returnDocuments: true }, options);
     return _dataRequest(client, httpRequest, "mutate", { mutations: [mutation] }, opts);
   }
-  const isQuery = (config, uri) => uri.startsWith("/data/query/") || config["~experimental_resource"] && uri.startsWith(
-    `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/query`
-  ), isMutate = (config, uri) => uri.startsWith("/data/mutate/") || config["~experimental_resource"] && uri.startsWith(
-    `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/mutate`
-  ), isDoc = (config, uri) => uri.startsWith("/data/doc/") || config["~experimental_resource"] && uri.startsWith(
-    `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/doc/`
-  ), isListener = (config, uri) => uri.startsWith("/data/listen/") || config["~experimental_resource"] && uri.startsWith(
-    `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/listen`
-  ), isHistory = (config, uri) => uri.startsWith("/data/history/") || config["~experimental_resource"] && uri.startsWith(
-    `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/history/`
-  ), isData = (config, uri) => uri.startsWith("/data/") || isQuery(config, uri) || isMutate(config, uri) || isDoc(config, uri) || isListener(config, uri) || isHistory(config, uri);
+  const resourceDatasetRegex = /^\/projects\/([^/]+)\/datasets\/([^/]+)\/([^/^?]+)\/?/, isResourceDataEndpoint = (config, uri, endpoint) => {
+    if (!config["~experimental_resource"])
+      return false;
+    if (uri.startsWith(
+      `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/${endpoint}`
+    ))
+      return true;
+    const match = uri.match(resourceDatasetRegex);
+    return match ? match[3] === endpoint : false;
+  }, isQuery = (config, uri) => uri.startsWith("/data/query/") || isResourceDataEndpoint(config, uri, "query"), isMutate = (config, uri) => uri.startsWith("/data/mutate/") || isResourceDataEndpoint(config, uri, "mutate"), isDoc = (config, uri) => uri.startsWith("/data/doc/") || isResourceDataEndpoint(config, uri, "doc"), isListener = (config, uri) => uri.startsWith("/data/listen/") || isResourceDataEndpoint(config, uri, "listen"), isHistory = (config, uri) => uri.startsWith("/data/history/") || isResourceDataEndpoint(config, uri, "history"), isData = (config, uri) => uri.startsWith("/data/") || isQuery(config, uri) || isMutate(config, uri) || isDoc(config, uri) || isListener(config, uri) || isHistory(config, uri);
   function _requestObservable(client, httpRequest, options) {
     const uri = options.url || options.uri, config = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && isData(config, uri) : options.canUseCdn;
     let useCdn = (options.useCdn ?? config.useCdn) && canUseCdn;