@farm.js/sanity 0.1.0-beta.104 → 0.1.0-beta.105

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,CA+HrF"}
+{"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"}

package/dist/content.js

@@ -44,19 +44,32 @@ export function sanitySource(options) {
         return writeClient;
     };
     // Entry ids are slugs by default, but Sanity mutations address `_id`.
-    // Remember the mapping from the last fetch and fall back to a lookup.
-    const documentIds = new Map();
+    // 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.
     const resolveDocumentId = async (id) => {
-        const known = documentIds.get(id);
-        if (known)
-            return known;
-        const bySlug = await resolveWriteClient().fetch("*[slug.current == $id][0]._id", { id });
-        return bySlug ?? 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 toDocument = (record) => {
         const id = resolveId(record) || record._id;
-        if (typeof record._id === "string")
-            documentIds.set(id, record._id);
         const body = options.body?.(record);
         return { id, data: record, ...(typeof body === "string" ? { body } : {}) };
     };
@@ -66,13 +79,17 @@ export function sanitySource(options) {
                 if (!options.createType) {
                     throw new Error(`sanitySource(${JSON.stringify(name)}) needs \`createType\` (the Sanity _type) to create documents`);
                 }
+                rejectUnsupportedBody(name, input.body);
+                // _type is forced after the spread so request-derived data cannot
+                // redirect the document into another type.
                 const created = await resolveWriteClient().create({
-                    _type: options.createType,
                     ...input.data,
+                    _type: options.createType,
                 });
                 return toDocument(created);
             },
             update: async (id, patch) => {
+                rejectUnsupportedBody(name, patch.body);
                 const documentId = await resolveDocumentId(id);
                 const updated = await resolveWriteClient()
                     .patch(documentId)
@@ -106,8 +123,6 @@ export function sanitySource(options) {
                     throw new Error(`sanitySource(${JSON.stringify(name)}) could not derive an id for the document at ` +
                         `index ${index}; give documents a slug or pass an \`id\` function`);
                 }
-                if (typeof record._id === "string")
-                    documentIds.set(id, record._id);
                 const body = options.body?.(record);
                 return {
                     id,
@@ -118,6 +133,12 @@ export function sanitySource(options) {
         },
     };
 }
+function rejectUnsupportedBody(name, body) {
+    if (typeof body !== "string")
+        return;
+    throw new Error(`sanitySource(${JSON.stringify(name)}) does not store \`body\`: Sanity documents keep ` +
+        "content in fields. Put the text in `data` under the field your schema expects.");
+}
 function defaultDocumentId(document) {
     const slug = document.slug;
     if (slug &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/sanity",
-  "version": "0.1.0-beta.104",
+  "version": "0.1.0-beta.105",
   "description": "Sanity CMS integration for Farm.js",
   "license": "MIT",
   "repository": {
@@ -27,18 +27,18 @@
   "dependencies": {
     "@sanity/image-url": "^2.1.1",
     "@sanity/webhook": "^4.0.4",
-    "@farm.js/core": "0.1.0-beta.104",
-    "@farm.js/integration-utils": "0.1.0-beta.104"
+    "@farm.js/core": "0.1.0-beta.105",
+    "@farm.js/integration-utils": "0.1.0-beta.105"
   },
   "devDependencies": {
     "@sanity/client": "^8.4.0",
     "typescript": "^5.3.3",
     "vitest": "^3.2.7",
-    "@farm.js/content": "0.1.0-beta.0"
+    "@farm.js/content": "0.1.0-beta.1"
   },
   "peerDependencies": {
     "@sanity/client": "^7.0.0 || ^8.0.0",
-    "@farm.js/content": "^0.1.0-beta.0"
+    "@farm.js/content": "^0.1.0-beta.1"
   },
   "peerDependenciesMeta": {
     "@farm.js/content": {