fix(jsonapi): add type and id in create and update payload if applicable

wunderwerkio · Jun 5, 2023 · 6928e40 · 6928e40
1 parent 5b6629f
commit 6928e40
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/.changeset/sour-pianos-camp.md b/.changeset/sour-pianos-camp.md
@@ -0,0 +1,5 @@
+---
+"@drupal-kit/jsonapi": patch
+---
+
+Add type and id in create and update payload if applicable
diff --git a/packages/jsonapi/src/DrupalkitJsonApi.ts b/packages/jsonapi/src/DrupalkitJsonApi.ts
@@ -186,6 +186,11 @@ export const DrupalkitJsonApi = (
 
     const url = buildJsonApiUrl(path, options);
 
+    // Set the type if not already set.
+    if (!parameters.payload.type) {
+      parameters.payload.type = type;
+    }
+
     const result = await drupalkit.request<Response<TResourceObject>>(url, {
       method: "POST",
       headers: defaultHeaders,
@@ -222,6 +227,13 @@ export const DrupalkitJsonApi = (
 
     const url = buildJsonApiUrl(path, options);
 
+    parameters.payload.id = parameters.uuid;
+
+    // Set the type if not already set.
+    if (!parameters.payload.type) {
+      parameters.payload.type = type;
+    }
+
     const result = await drupalkit.request<Response<TResourceObject>>(url, {
       method: "PATCH",
       headers: defaultHeaders,

diff --git a/packages/jsonapi/src/resources.ts b/packages/jsonapi/src/resources.ts
@@ -213,6 +213,7 @@ type ResourceCreatePayload<
  * Extract the update payload type from a resource object.
  */
 type ResourceUpdatePayload<R extends JsonApiResource> = object & {
+  id?: R["id"];
   type?: R["type"];
   attributes?: Partial<R["attributes"]>;
   relationships?: Partial<R["relationships"]>;

diff --git a/packages/jsonapi/tests/resources.test.ts b/packages/jsonapi/tests/resources.test.ts
@@ -360,18 +360,22 @@ test.serial("Handle network error", async (t) => {
 test.serial("Create new resource", async (t) => {
   const drupalkit = createDrupalkit();
 
+  t.plan(3);
+
   server.use(
-    rest.post("*/jsonapi/node/article", (_req, res, ctx) =>
-      res(
+    rest.post("*/jsonapi/node/article", async (req, res, ctx) => {
+      const payload = await req.json();
+      t.is(payload.type, "node--article");
+
+      return res(
         ctx.set("Content-Type", "application/vnd.api+json"),
         ctx.json(JsonApiArticleDetail),
-      ),
-    ),
+      );
+    }),
   );
 
   const result = await drupalkit.jsonApi.resource("node--article", "create", {
     payload: {
-      type: "node--article",
       attributes: {
         title: "New Article",
       },
@@ -435,13 +439,20 @@ test.serial("Update resource", async (t) => {
   const drupalkit = createDrupalkit();
   const uuid = "5f5f5f5f-5f5f-5f5f-5f5f-5f5f5f5f5f5f";
 
+  t.plan(4);
+
   server.use(
-    rest.patch("*/jsonapi/node/article/" + uuid, (_req, res, ctx) =>
-      res(
+    rest.patch("*/jsonapi/node/article/" + uuid, async (req, res, ctx) => {
+      const payload = await req.json();
+
+      t.is(payload.type, "node--article");
+      t.is(payload.id, uuid);
+
+      return res(
         ctx.set("Content-Type", "application/vnd.api+json"),
         ctx.json(JsonApiArticleDetail),
-      ),
-    ),
+      );
+    }),
   );
 
   const result = await drupalkit.jsonApi.resource("node--article", "update", {