@farm.js/sanity 0.1.0-beta.107 → 0.1.0-beta.108

package/dist/content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAInD,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC;IACnD,6EAA6E;IAC7E,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;IACjE,oDAAoD;IACpD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,mBAAmB,CA8IrF"}
+{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAInD,MAAM,WAAW,0BAA0B;IACzC,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC;IACnD,6EAA6E;IAC7E,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;IACjE,oDAAoD;IACpD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,0BAA0B,GAAG,mBAAmB,CA0KrF"}

package/dist/content.js

@@ -44,29 +44,44 @@ export function sanitySource(options) {
         return writeClient;
     };
     // Entry ids are slugs by default, but Sanity mutations address `_id`.
-    // Resolve live on every write: a cached mapping goes stale the moment an
-    // editor reassigns a slug, and writes are rare enough that one lookup is
-    // the right price for addressing the intended document. When `createType`
-    // is configured the lookup is constrained to it, so a slug shared with an
-    // unrelated document type cannot redirect the mutation.
+    //
+    // Resolve against the collection's own read query, so a write can only ever
+    // address a document this collection actually reads. Two earlier shapes were
+    // both wrong: an unconstrained `slug.current == $id` lookup could resolve a
+    // document of an unrelated type that happened to share the slug, and
+    // deleting it destroyed data the collection does not own; constraining to
+    // `createType` instead left every entry of any other type in a multi-type
+    // collection unresolvable, so ordinary updates started throwing.
+    //
+    // Resolved live on every write, because a cached mapping goes stale the
+    // moment an editor reassigns a slug. That costs one query per write, which
+    // is the same query the read path already runs, and writes are rare next to
+    // reads.
     const resolveDocumentId = async (id) => {
-        const query = options.createType
-            ? "*[slug.current == $id && _type == $type][0]._id"
-            : "*[slug.current == $id][0]._id";
-        const bySlug = await resolveWriteClient().fetch(query, {
-            id,
-            ...(options.createType ? { type: options.createType } : {}),
-        });
-        if (bySlug)
-            return bySlug;
-        // An id that is itself a document _id (custom `id` option) still works.
-        const direct = await resolveWriteClient().fetch("*[_id == $id][0]._id", {
-            id,
-        });
-        if (direct)
-            return direct;
-        throw new Error(`sanitySource(${JSON.stringify(name)}) could not resolve ${JSON.stringify(id)} to a ` +
-            "document; the write was not sent. The entry may have been deleted or its slug changed.");
+        const documents = await resolveWriteClient().fetch(options.query, options.params ?? {});
+        if (!Array.isArray(documents)) {
+            throw new Error(`sanitySource(${JSON.stringify(name)}) query must resolve to an array of documents; ` +
+                "the write was not sent.");
+        }
+        const records = documents;
+        const match = records.find((record) => resolveId(record) === id) ??
+            // A custom `id` option can address documents by their own `_id`.
+            records.find((record) => record._id === id);
+        if (!match) {
+            throw new Error(`sanitySource(${JSON.stringify(name)}) could not resolve ${JSON.stringify(id)} to a ` +
+                "document this collection reads; the write was not sent. The entry may have been " +
+                "deleted, its slug may have changed, or it may belong to another collection.");
+        }
+        const documentId = match._id;
+        if (typeof documentId !== "string" || !documentId) {
+            // Reads only need an id the projection can derive, so a query that omits
+            // `_id` loads fine and then cannot be written back. Say which projection
+            // is short rather than claiming the entry does not exist.
+            throw new Error(`sanitySource(${JSON.stringify(name)}) resolved ${JSON.stringify(id)} to a document ` +
+                "without an `_id`; the write was not sent. Add `_id` to the collection query's " +
+                "projection so writes can address the document.");
+        }
+        return documentId;
     };
     const toDocument = (record) => {
         const id = resolveId(record) || record._id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/sanity",
-  "version": "0.1.0-beta.107",
+  "version": "0.1.0-beta.108",
   "description": "Sanity CMS integration for Farm.js",
   "license": "MIT",
   "repository": {
@@ -27,8 +27,8 @@
   "dependencies": {
     "@sanity/image-url": "^2.1.1",
     "@sanity/webhook": "^4.0.4",
-    "@farm.js/core": "0.1.0-beta.107",
-    "@farm.js/integration-utils": "0.1.0-beta.107"
+    "@farm.js/core": "0.1.0-beta.108",
+    "@farm.js/integration-utils": "0.1.0-beta.108"
   },
   "devDependencies": {
     "@sanity/client": "^8.4.0",