@jskit-ai/http-runtime 0.1.59 → 0.1.61

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   "packageVersion": 1,
   "packageId": "@jskit-ai/http-runtime",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "kind": "runtime",
   "dependsOn": [],
   "capabilities": {
@@ -67,7 +67,7 @@ export default Object.freeze({
   "mutations": {
     "dependencies": {
       "runtime": {
-        "@jskit-ai/kernel": "0.1.60"
+        "@jskit-ai/kernel": "0.1.62"
       },
       "dev": {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/http-runtime",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -18,7 +18,7 @@
     "./shared/validators/operationValidation": "./src/shared/validators/operationValidation.js"
   },
   "dependencies": {
-    "@jskit-ai/kernel": "0.1.60",
+    "@jskit-ai/kernel": "0.1.62",
     "json-rest-schema": "1.x.x"
   }
 }

package/src/shared/clientRuntime/jsonApiResourceTransport.js

@@ -7,6 +7,10 @@ import {
   resolveJsonApiTransportTypes
 } from "../validators/jsonApiTransport.js";
 import { encodeJsonApiResourceQueryObject } from "../validators/jsonApiQueryTransport.js";
+import {
+  resolveRelationshipFieldKey,
+  simplifyJsonApiResourceWithRelationshipIds
+} from "../support/jsonApiSimplify.js";
 
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
@@ -98,16 +102,6 @@ function encodeJsonApiResourceQuery(query, transport = null) {
   });
 }
 
-function resolveRelationshipFieldKey(relationshipName = "", lookupFieldMap = null) {
-  const normalizedRelationshipName = normalizeText(relationshipName);
-  const explicitFieldKey = normalizeText(lookupFieldMap?.[normalizedRelationshipName]);
-  if (explicitFieldKey) {
-    return explicitFieldKey;
-  }
-
-  return normalizedRelationshipName ? `${normalizedRelationshipName}Id` : "";
-}
-
 function createIncludedResourceIndex(document = {}) {
   const index = new Map();
 
@@ -135,9 +129,7 @@ function simplifyRelationshipResource(linkage = {}, options = {}) {
   const resourceKey = `${type}:${id}`;
   const includedResource = options.includedResourceIndex?.get(resourceKey);
   if (!includedResource) {
-    return {
-      id
-    };
+    return null;
   }
 
   return simplifyResourceObject(includedResource, options);
@@ -145,10 +137,9 @@ function simplifyRelationshipResource(linkage = {}, options = {}) {
 
 function simplifyResourceObject(resource = {}, options = {}) {
   const normalizedResource = isRecord(resource) ? normalizeObject(resource) : {};
-  const simplified = {
-    id: normalizedResource.id == null ? "" : String(normalizedResource.id),
-    ...(normalizeObject(normalizedResource.attributes))
-  };
+  const simplified = simplifyJsonApiResourceWithRelationshipIds(normalizedResource, {
+    lookupFieldMap: options.lookupFieldMap || null
+  });
   const lookupContainerKey = normalizeText(options.lookupContainerKey, {
     fallback: "lookups"
   });

package/src/shared/support/jsonApiSimplify.js

@@ -0,0 +1,39 @@
+import { isRecord, normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+
+function resolveRelationshipFieldKey(relationshipName = "", lookupFieldMap = null) {
+  const normalizedRelationshipName = normalizeText(relationshipName);
+  const explicitFieldKey = normalizeText(lookupFieldMap?.[normalizedRelationshipName]);
+  if (explicitFieldKey) {
+    return explicitFieldKey;
+  }
+
+  return normalizedRelationshipName ? `${normalizedRelationshipName}Id` : "";
+}
+
+function simplifyJsonApiResourceWithRelationshipIds(resource = {}, { lookupFieldMap = null } = {}) {
+  const normalizedResource = isRecord(resource) ? normalizeObject(resource) : {};
+  const simplified = {
+    id: normalizedResource.id == null ? "" : String(normalizedResource.id),
+    ...(normalizeObject(normalizedResource.attributes))
+  };
+
+  for (const [relationshipName, relationshipValue] of Object.entries(normalizeObject(normalizedResource.relationships))) {
+    const relationshipData = relationshipValue?.data;
+    if (Array.isArray(relationshipData)) {
+      continue;
+    }
+
+    const fieldKey = resolveRelationshipFieldKey(relationshipName, lookupFieldMap);
+    if (!fieldKey || Object.hasOwn(simplified, fieldKey)) {
+      continue;
+    }
+    simplified[fieldKey] = relationshipData?.id == null ? null : String(relationshipData.id);
+  }
+
+  return simplified;
+}
+
+export {
+  resolveRelationshipFieldKey,
+  simplifyJsonApiResourceWithRelationshipIds
+};

package/src/shared/validators/jsonApiTransport.js

@@ -1,4 +1,5 @@
 import { normalizeArray, normalizeObject, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { simplifyJsonApiResourceWithRelationshipIds } from "../support/jsonApiSimplify.js";
 
 const JSON_API_CONTENT_TYPE = "application/vnd.api+json";
 
@@ -441,11 +442,7 @@ function createJsonApiErrorDocumentFromFailure({
 }
 
 function simplifyJsonApiResourceObject(resource = {}) {
-  const normalized = normalizeJsonApiResourceObject(resource);
-  return {
-    id: normalized.id == null ? "" : normalized.id,
-    ...(normalized.attributes || {})
-  };
+  return simplifyJsonApiResourceWithRelationshipIds(normalizeJsonApiResourceObject(resource));
 }
 
 function simplifyJsonApiDocument(payload = {}) {

package/test/client.test.js

@@ -236,6 +236,57 @@ test("request decodes json:api relationship includes into JSKIT lookups and fore
   });
 });
 
+test("request keeps relationship foreign-key fields even when related resources are not included", async () => {
+  const fetchImpl = async () =>
+    mockResponse({
+      contentType: "application/vnd.api+json",
+      data: {
+        data: {
+          type: "pets",
+          id: "729900",
+          attributes: {
+            name: "Daisy"
+          },
+          relationships: {
+            contact: {
+              data: {
+                type: "contacts",
+                id: "552252"
+              }
+            },
+            breed: {
+              data: {
+                type: "breeds",
+                id: "2"
+              }
+            }
+          }
+        }
+      }
+    });
+
+  const client = createHttpClient({ fetchImpl });
+  const payload = await client.request("/api/pets/729900", {
+    method: "GET",
+    transport: {
+      kind: "jsonapi-resource",
+      responseType: "pets",
+      responseKind: "record",
+      lookupFieldMap: {
+        contact: "contactId",
+        breed: "breedId"
+      }
+    }
+  });
+
+  assert.deepEqual(payload, {
+    id: "729900",
+    name: "Daisy",
+    contactId: "552252",
+    breedId: "2"
+  });
+});
+
 test("request recursively decodes nested included relationships for collection-style lookups", async () => {
   const fetchImpl = async () =>
     mockResponse({

package/test/jsonApiTransport.test.js

@@ -173,6 +173,40 @@ test("simplifyJsonApiDocument keeps flat-record behavior for resource and collec
   );
 });
 
+test("simplifyJsonApiDocument preserves single-relationship foreign key ids without lookup hydration", () => {
+  assert.deepEqual(
+    simplifyJsonApiDocument({
+      data: {
+        type: "workspace-memberships",
+        id: "11",
+        attributes: {
+          status: "active"
+        },
+        relationships: {
+          workspace: {
+            data: {
+              type: "workspaces",
+              id: "7"
+            }
+          },
+          user: {
+            data: {
+              type: "userProfiles",
+              id: "9"
+            }
+          }
+        }
+      }
+    }),
+    {
+      id: "11",
+      status: "active",
+      workspaceId: "7",
+      userId: "9"
+    }
+  );
+});
+
 test("createJsonApiErrorDocumentFromFailure maps field errors and validation issues to JSON:API errors", () => {
   assert.deepEqual(
     createJsonApiErrorDocumentFromFailure({