@jskit-ai/workspaces-core 0.1.33 → 0.1.35

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-core",
-  version: "0.1.33",
+  version: "0.1.35",
   kind: "runtime",
   description: "Workspace tenancy runtime plus HTTP routes, role catalog, and workspace config scaffolding.",
   dependsOn: [
@@ -116,10 +116,10 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/json-rest-api-core": "0.1.2",
-        "@jskit-ai/resource-core": "0.1.2",
-        "@jskit-ai/resource-crud-core": "0.1.2",
-        "@jskit-ai/users-core": "0.1.67"
+        "@jskit-ai/json-rest-api-core": "0.1.4",
+        "@jskit-ai/resource-core": "0.1.4",
+        "@jskit-ai/resource-crud-core": "0.1.4",
+        "@jskit-ai/users-core": "0.1.69"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-core",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -17,14 +17,14 @@
     "./shared/resources/workspaceSettingsResource": "./src/shared/resources/workspaceSettingsResource.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.56",
-    "@jskit-ai/database-runtime": "0.1.57",
-    "@jskit-ai/http-runtime": "0.1.56",
-    "@jskit-ai/json-rest-api-core": "0.1.2",
-    "@jskit-ai/kernel": "0.1.57",
-    "@jskit-ai/resource-crud-core": "0.1.2",
-    "@jskit-ai/resource-core": "0.1.2",
-    "@jskit-ai/users-core": "0.1.67",
+    "@jskit-ai/auth-core": "0.1.58",
+    "@jskit-ai/database-runtime": "0.1.59",
+    "@jskit-ai/http-runtime": "0.1.58",
+    "@jskit-ai/json-rest-api-core": "0.1.4",
+    "@jskit-ai/kernel": "0.1.59",
+    "@jskit-ai/resource-crud-core": "0.1.4",
+    "@jskit-ai/resource-core": "0.1.4",
+    "@jskit-ai/users-core": "0.1.69",
     "json-rest-schema": "1.x.x"
   }
 }

package/src/server/common/repositories/workspaceInvitesRepository.js

@@ -12,7 +12,7 @@ import {
   createJsonApiInputRecord,
   createJsonApiRelationship,
   createJsonRestContext,
-  simplifyJsonApiDocument
+  extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 
 const RESOURCE_TYPE = "workspaceInvites";
@@ -105,19 +105,19 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryInvites(filters = {}, options = {}, { includeWorkspace = false } = {}) {
-    const result = await api.resources.workspaceInvites.query(
-      {
-        queryParams: {
-          filters,
-          ...(includeWorkspace ? { include: ["workspace"] } : {})
+    return extractJsonRestCollectionRows(
+      await api.resources.workspaceInvites.query(
+        {
+          queryParams: {
+            filters,
+            ...(includeWorkspace ? { include: ["workspace"] } : {})
+          },
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
-
-    return Array.isArray(simplifyJsonApiDocument(result)) ? simplifyJsonApiDocument(result) : [];
   }
 
   async function findPendingByTokenHash(tokenHash, options = {}) {
@@ -213,13 +213,12 @@ function createRepository({ api, knex } = {}) {
               })
             }
           ),
-          transaction: options?.trx || null,
-          simplified: false
+          transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
 
-      return normalizeInviteRecord(simplifyJsonApiDocument(created));
+      return normalizeInviteRecord(created);
     } catch (error) {
       if (!isDuplicateEntryError(error)) {
         throw error;
@@ -271,8 +270,7 @@ function createRepository({ api, knex } = {}) {
               id: row.id
             }
           ),
-          transaction: options?.trx || null,
-          simplified: false
+          transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
@@ -298,8 +296,7 @@ function createRepository({ api, knex } = {}) {
             id: normalizedInviteId
           }
         ),
-        transaction: options?.trx || null,
-        simplified: false
+        transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
     );
@@ -324,8 +321,7 @@ function createRepository({ api, knex } = {}) {
             id: normalizedInviteId
           }
         ),
-        transaction: options?.trx || null,
-        simplified: false
+        transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
     );

package/src/server/common/repositories/workspaceMembershipsRepository.js

@@ -11,7 +11,7 @@ import {
   createJsonApiInputRecord,
   createJsonApiRelationship,
   createJsonRestContext,
-  simplifyJsonApiDocument
+  extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { OWNER_ROLE_ID } from "../../../shared/roles.js";
 
@@ -84,20 +84,27 @@ function createRepository({ api, knex } = {}) {
 
   const withTransaction = createWithTransaction(knex);
 
-  async function queryMemberships(filters = {}, options = {}, { includeUser = false } = {}) {
-    const result = await api.resources.workspaceMemberships.query(
-      {
-        queryParams: {
-          filters,
-          ...(includeUser ? { include: ["user"] } : {})
+  async function queryMemberships(filters = {}, options = {}, { include = [] } = {}) {
+    const normalizedInclude = Array.from(
+      new Set(
+        (Array.isArray(include) ? include : [])
+          .map((entry) => normalizeText(entry))
+          .filter(Boolean)
+      )
+    );
+    return extractJsonRestCollectionRows(
+      await api.resources.workspaceMemberships.query(
+        {
+          queryParams: {
+            filters,
+            ...(normalizedInclude.length > 0 ? { include: normalizedInclude } : {})
+          },
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
-
-    return Array.isArray(simplifyJsonApiDocument(result)) ? simplifyJsonApiDocument(result) : [];
   }
 
   async function findByWorkspaceIdAndUserId(workspaceId, userId, options = {}) {
@@ -141,8 +148,7 @@ function createRepository({ api, knex } = {}) {
                 id: existing.id
               }
             ),
-            transaction: options?.trx || null,
-            simplified: false
+            transaction: options?.trx || null
           },
           createJsonRestContext(options?.context || null)
         );
@@ -168,8 +174,7 @@ function createRepository({ api, knex } = {}) {
               })
             }
           ),
-          transaction: options?.trx || null,
-          simplified: false
+          transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
@@ -216,8 +221,7 @@ function createRepository({ api, knex } = {}) {
                 })
               }
             ),
-            transaction: options?.trx || null,
-            simplified: false
+            transaction: options?.trx || null
           },
           createJsonRestContext(options?.context || null)
         );
@@ -242,8 +246,7 @@ function createRepository({ api, knex } = {}) {
             id: existing.id
           }
         ),
-        transaction: options?.trx || null,
-        simplified: false
+        transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
     );
@@ -263,7 +266,7 @@ function createRepository({ api, knex } = {}) {
         status: "active"
       },
       options,
-      { includeUser: true }
+      { include: ["user"] }
     );
 
     const members = rows

package/src/server/common/repositories/workspacesRepository.js

@@ -9,7 +9,7 @@ import {
   createJsonApiInputRecord,
   createJsonApiRelationship,
   createJsonRestContext,
-  simplifyJsonApiDocument
+  extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 
 const RESOURCE_TYPE = "workspaces";
@@ -54,19 +54,20 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryFirst(filters = {}, options = {}) {
-    const result = await api.resources.workspaces.query(
-      {
-        queryParams: {
-          filters
+    const rows = extractJsonRestCollectionRows(
+      await api.resources.workspaces.query(
+        {
+          queryParams: {
+            filters
+          },
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
 
-    const rows = simplifyJsonApiDocument(result);
-    return normalizeWorkspaceRecord(Array.isArray(rows) ? rows[0] || null : null);
+    return normalizeWorkspaceRecord(rows[0] || null);
   }
 
   async function findById(workspaceId, options = {}) {
@@ -93,24 +94,24 @@ function createRepository({ api, knex } = {}) {
       return null;
     }
 
-    const result = await api.resources.workspaces.query(
-      {
-        queryParams: {
-          filters: {
-            owner: normalizedUserId,
-            isPersonal: true
-          }
+    const rows = extractJsonRestCollectionRows(
+      await api.resources.workspaces.query(
+        {
+          queryParams: {
+            filters: {
+              owner: normalizedUserId,
+              isPersonal: true
+            }
+          },
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
 
-    const rows = Array.isArray(simplifyJsonApiDocument(result))
-      ? simplifyJsonApiDocument(result).map((row) => normalizeWorkspaceRecord(row)).filter(Boolean)
-      : [];
-    rows.sort((left, right) => {
+    const normalizedRows = rows.map((row) => normalizeWorkspaceRecord(row)).filter(Boolean);
+    normalizedRows.sort((left, right) => {
       const leftId = Number(left?.id);
       const rightId = Number(right?.id);
       if (Number.isFinite(leftId) && Number.isFinite(rightId)) {
@@ -118,7 +119,7 @@ function createRepository({ api, knex } = {}) {
       }
       return String(left?.id || "").localeCompare(String(right?.id || ""));
     });
-    return rows[0] || null;
+    return normalizedRows[0] || null;
   }
 
   async function insert(payload = {}, options = {}) {
@@ -149,13 +150,12 @@ function createRepository({ api, knex } = {}) {
               relationships: createWorkspaceRelationships({ ownerUserId })
             }
           ),
-          transaction: options?.trx || null,
-          simplified: false
+          transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
 
-      return normalizeWorkspaceRecord(simplifyJsonApiDocument(created));
+      return normalizeWorkspaceRecord(created);
     } catch (error) {
       if (!isDuplicateEntryError(error)) {
         throw error;
@@ -195,13 +195,12 @@ function createRepository({ api, knex } = {}) {
             relationships
           }
         ),
-        transaction: options?.trx || null,
-        simplified: false
+        transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
     );
 
-    return normalizeWorkspaceRecord(simplifyJsonApiDocument(updated));
+    return normalizeWorkspaceRecord(updated);
   }
 
   async function listForUserId(userId, options = {}) {
@@ -210,22 +209,23 @@ function createRepository({ api, knex } = {}) {
       return [];
     }
 
-    const result = await api.resources.workspaceMemberships.query(
-      {
-        queryParams: {
-          filters: {
-            user: normalizedUserId,
-            status: "active"
+    const rows = extractJsonRestCollectionRows(
+      await api.resources.workspaceMemberships.query(
+        {
+          queryParams: {
+            filters: {
+              user: normalizedUserId,
+              status: "active"
+            },
+            include: ["workspace"]
           },
-          include: ["workspace"]
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
 
-    const rows = Array.isArray(simplifyJsonApiDocument(result)) ? simplifyJsonApiDocument(result) : [];
     const workspaces = rows
       .map((row) => {
         const workspace = normalizeWorkspaceRecord(row?.workspace);

package/src/server/workspaceSettings/workspaceSettingsRepository.js

@@ -7,7 +7,7 @@ import {
 import {
   createJsonApiInputRecord,
   createJsonRestContext,
-  simplifyJsonApiDocument
+  extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { resolveWorkspaceThemePalettes } from "../../shared/settings.js";
 
@@ -63,19 +63,20 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryFirst(filters = {}, options = {}) {
-    const result = await api.resources.workspaceSettings.query(
-      {
-        queryParams: {
-          filters
+    const rows = extractJsonRestCollectionRows(
+      await api.resources.workspaceSettings.query(
+        {
+          queryParams: {
+            filters
+          },
+          transaction: options?.trx || null,
+          simplified: true
         },
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
+        createJsonRestContext(options?.context || null)
+      )
     );
 
-    const rows = simplifyJsonApiDocument(result);
-    return Array.isArray(rows) ? rows[0] || null : null;
+    return rows[0] || null;
   }
 
   async function findByWorkspaceId(workspaceId, options = {}) {
@@ -108,8 +109,7 @@ function createRepository({ api, knex } = {}) {
               id: normalizedWorkspaceId
             }
           ),
-          transaction: options?.trx || null,
-          simplified: false
+          transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
@@ -148,8 +148,7 @@ function createRepository({ api, knex } = {}) {
             id: normalizedWorkspaceId
           }
         ),
-        transaction: options?.trx || null,
-        simplified: false
+        transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
     );

package/test/workspaceInvitesRepository.test.js

@@ -15,34 +15,34 @@ function createKnexStub() {
   return knex;
 }
 
-function toWorkspaceInviteResource(row = {}, { includeWorkspace = false } = {}) {
+function asCollectionDocument(rows = []) {
+  return {
+    data: Array.isArray(rows) ? rows : []
+  };
+}
+
+function toWorkspaceInviteRow(row = {}) {
   return {
-    type: "workspaceInvites",
     id: String(row.id || ""),
-    attributes: {
-      email: row.email,
-      roleSid: row.roleSid,
-      status: row.status,
-      tokenHash: row.tokenHash,
-      expiresAt: row.expiresAt,
-      acceptedAt: row.acceptedAt,
-      revokedAt: row.revokedAt,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
+    workspaceId: row?.workspace?.id == null ? null : String(row.workspace.id),
+    workspace: row?.workspace?.id == null ? null : {
+      ...row.workspace,
+      id: String(row.workspace.id)
     },
-    relationships: {
-      workspace: {
-        data: row?.workspace?.id == null
-          ? null
-          : {
-              type: "workspaces",
-              id: String(row.workspace.id)
-            }
-      },
-      invitedByUser: {
-        data: row?.invitedByUser?.id == null ? null : { type: "userProfiles", id: String(row.invitedByUser.id) }
-      }
-    }
+    email: row.email,
+    roleSid: row.roleSid,
+    status: row.status,
+    tokenHash: row.tokenHash,
+    invitedByUserId: row?.invitedByUser?.id == null ? null : String(row.invitedByUser.id),
+    invitedByUser: row?.invitedByUser?.id == null ? null : {
+      ...row.invitedByUser,
+      id: String(row.invitedByUser.id)
+    },
+    expiresAt: row.expiresAt,
+    acceptedAt: row.acceptedAt,
+    revokedAt: row.revokedAt,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt
   };
 }
 
@@ -60,7 +60,6 @@ function createWorkspaceInvitesApiStub({
       workspaceInvites: {
         async query({ queryParams }) {
           const filters = queryParams?.filters || {};
-          const includeWorkspace = Array.isArray(queryParams?.include) && queryParams.include.includes("workspace");
           const matching = rows.filter((row) => {
             if (Object.hasOwn(filters, "id") && String(row.id) !== String(filters.id)) {
               return false;
@@ -80,25 +79,9 @@ function createWorkspaceInvitesApiStub({
             return true;
           });
 
-          return {
-            data: matching.map((row) => toWorkspaceInviteResource(row, { includeWorkspace })),
-            included: includeWorkspace
-              ? matching
-                  .filter((row) => row?.workspace?.id != null)
-                  .map((row) => ({
-                    type: "workspaces",
-                    id: String(row.workspace.id),
-                    attributes: {
-                      slug: row.workspace.slug,
-                      name: row.workspace.name,
-                      avatarUrl: row.workspace.avatarUrl
-                    }
-                  }))
-              : []
-          };
+          return asCollectionDocument(matching.map((row) => toWorkspaceInviteRow(row)));
         },
         async post(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.postPayload = inputRecord;
           const row = {
@@ -119,10 +102,9 @@ function createWorkspaceInvitesApiStub({
           };
           rows.push(row);
           rowById.set("1", row);
-          return { data: toWorkspaceInviteResource(row) };
+          return toWorkspaceInviteRow(row);
         },
         async patch(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.patchPayloads.push(inputRecord);
           const existing = rowById.get(String(inputRecord.id));
@@ -134,7 +116,7 @@ function createWorkspaceInvitesApiStub({
             rowById.set(String(inputRecord.id), updated);
           }
           const updatedRow = rowById.get(String(inputRecord.id)) || null;
-          return updatedRow ? { data: toWorkspaceInviteResource(updatedRow) } : null;
+          return updatedRow ? toWorkspaceInviteRow(updatedRow) : null;
         }
       }
     }

package/test/workspaceMembershipsRepository.test.js

@@ -15,29 +15,31 @@ function createKnexStub() {
   return knex;
 }
 
-function toWorkspaceMembershipResource(row = {}) {
+function asCollectionDocument(rows = []) {
+  return {
+    data: Array.isArray(rows) ? rows : []
+  };
+}
+
+function toWorkspaceMembershipRow(row = {}) {
   return {
-    type: "workspaceMemberships",
     id: String(row.id || ""),
-    attributes: {
-      roleSid: row.roleSid,
-      status: row.status,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
+    workspaceId: row?.workspace?.id == null ? null : String(row.workspace.id),
+    workspace: row?.workspace?.id == null ? null : {
+      ...row.workspace,
+      id: String(row.workspace.id)
     },
-    relationships: {
-      workspace: {
-        data: row?.workspace?.id == null ? null : { type: "workspaces", id: String(row.workspace.id) }
-      },
-      user: {
-        data: row?.user?.id == null
-          ? null
-          : {
-              type: "userProfiles",
-              id: String(row.user.id)
-            }
-      }
-    }
+    userId: row?.user?.id == null ? null : String(row.user.id),
+    user: row?.user?.id == null
+      ? null
+      : {
+          ...row.user,
+          id: String(row.user.id)
+        },
+    roleSid: row.roleSid,
+    status: row.status,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt
   };
 }
 
@@ -48,35 +50,25 @@ function createWorkspaceMembershipsApiStub({
 } = {}) {
   const state = {
     postPayload: null,
-    patchPayload: null
+    patchPayload: null,
+    queryCalls: []
   };
 
   const api = {
     resources: {
       workspaceMemberships: {
         async query({ queryParams }) {
+          state.queryCalls.push(queryParams || {});
           const filters = queryParams?.filters || {};
           const includeUser = Array.isArray(queryParams?.include) && queryParams.include.includes("user");
 
           if (Object.hasOwn(filters, "workspace") && Object.hasOwn(filters, "user")) {
             const row = rowByComposite.get(`${filters.workspace}:${filters.user}`) || null;
-            return { data: row ? [toWorkspaceMembershipResource(row)] : [] };
+            return asCollectionDocument(row ? [toWorkspaceMembershipRow(row)] : []);
           }
 
           if (Object.hasOwn(filters, "workspace") && Object.hasOwn(filters, "status") && includeUser) {
-            return {
-              data: memberSummaryRows.map((row) => toWorkspaceMembershipResource(row)),
-              included: memberSummaryRows
-                .filter((row) => row?.user?.id != null)
-                .map((row) => ({
-                  type: "userProfiles",
-                  id: String(row.user.id),
-                  attributes: {
-                    displayName: row.user.displayName,
-                    email: row.user.email
-                  }
-                }))
-            };
+            return asCollectionDocument(memberSummaryRows.map((row) => toWorkspaceMembershipRow(row)));
           }
 
           if (Object.hasOwn(filters, "user") && Object.hasOwn(filters, "status")) {
@@ -84,13 +76,12 @@ function createWorkspaceMembershipsApiStub({
               String(row?.user?.id || "") === String(filters.user) &&
               String(row?.status || "") === String(filters.status)
             ));
-            return { data: rows.map((row) => toWorkspaceMembershipResource(row)) };
+            return asCollectionDocument(rows.map((row) => toWorkspaceMembershipRow(row)));
           }
 
-          return { data: [] };
+          return asCollectionDocument([]);
         },
         async post(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.postPayload = inputRecord;
           const row = rowById.get("1") || {
@@ -104,10 +95,9 @@ function createWorkspaceMembershipsApiStub({
           };
           rowByComposite.set(`${row.workspace.id}:${row.user.id}`, row);
           rowById.set(String(row.id), row);
-          return { data: toWorkspaceMembershipResource(row) };
+          return toWorkspaceMembershipRow(row);
         },
         async patch(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.patchPayload = inputRecord;
           const existing = rowById.get(String(inputRecord.id));
@@ -120,7 +110,7 @@ function createWorkspaceMembershipsApiStub({
           };
           rowById.set(String(updated.id), updated);
           rowByComposite.set(`${updated.workspace.id}:${updated.user.id}`, updated);
-          return { data: toWorkspaceMembershipResource(updated) };
+          return toWorkspaceMembershipRow(updated);
         }
       }
     }
@@ -250,3 +240,23 @@ test("workspaceMembershipsRepository.listActiveByWorkspaceId keeps summary rows
     }
   ]);
 });
+
+test("workspaceMembershipsRepository.listActiveWorkspaceIdsByUserId returns normalized workspace ids from the canonical resource", async () => {
+  const membershipRow = {
+    id: "11",
+    workspace: { id: "7" },
+    user: { id: "9" },
+    roleSid: "owner",
+    status: "active",
+    createdAt: "2026-03-09 00:26:35.710",
+    updatedAt: "2026-03-10 00:26:35.710"
+  };
+  const { api } = createWorkspaceMembershipsApiStub({
+    rowByComposite: new Map([["7:9", membershipRow]])
+  });
+  const repository = createRepository({ api, knex: createKnexStub() });
+
+  const workspaceIds = await repository.listActiveWorkspaceIdsByUserId("9");
+
+  assert.deepEqual(workspaceIds, ["7"]);
+});

package/test/workspaceSettingsRepository.test.js

@@ -20,6 +20,12 @@ function normalizeWorkspaceColor(value) {
   return typeof value === "string" ? value.toUpperCase() : value;
 }
 
+function asCollectionDocument(rows = []) {
+  return {
+    data: Array.isArray(rows) ? rows : []
+  };
+}
+
 function createWorkspaceSettingsApiStub(rowOverrides = {}) {
   const DEFAULT_WORKSPACE_THEME = resolveWorkspaceThemePalettes({});
   const STUB_CREATED_AT = "2026-03-09 00:26:35.710";
@@ -51,31 +57,15 @@ function createWorkspaceSettingsApiStub(rowOverrides = {}) {
         async query({ queryParams }) {
           const id = String(queryParams?.filters?.id || "");
           if (!state.row || (id && String(state.row.id) !== id)) {
-            return { data: [] };
+            return asCollectionDocument([]);
           }
 
-          return {
-            data: [{
-              type: "workspaceSettings",
-              id: String(state.row.id),
-              attributes: {
-                lightPrimaryColor: state.row.lightPrimaryColor,
-                lightSecondaryColor: state.row.lightSecondaryColor,
-                lightSurfaceColor: state.row.lightSurfaceColor,
-                lightSurfaceVariantColor: state.row.lightSurfaceVariantColor,
-                darkPrimaryColor: state.row.darkPrimaryColor,
-                darkSecondaryColor: state.row.darkSecondaryColor,
-                darkSurfaceColor: state.row.darkSurfaceColor,
-                darkSurfaceVariantColor: state.row.darkSurfaceVariantColor,
-                invitesEnabled: state.row.invitesEnabled,
-                createdAt: state.row.createdAt,
-                updatedAt: state.row.updatedAt
-              }
-            }]
-          };
+          return asCollectionDocument([{
+            ...state.row,
+            id: String(state.row.id)
+          }]);
         },
         async post(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           const attributes = inputRecord.attributes || {};
           state.postPayload = inputRecord;
@@ -94,17 +84,11 @@ function createWorkspaceSettingsApiStub(rowOverrides = {}) {
             updatedAt: toIsoString("2026-03-10 00:00:00.000")
           };
           return {
-            data: {
-              type: "workspaceSettings",
-              id: String(state.row.id),
-              attributes: {
-                ...state.row
-              }
-            }
+            ...state.row,
+            id: String(state.row.id)
           };
         },
         async patch(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           const attributes = inputRecord.attributes || {};
           state.patchPayload = inputRecord;
@@ -122,13 +106,8 @@ function createWorkspaceSettingsApiStub(rowOverrides = {}) {
             id: String(inputRecord.id || state.row?.id || "")
           };
           return {
-            data: {
-              type: "workspaceSettings",
-              id: String(state.row.id),
-              attributes: {
-                ...state.row
-              }
-            }
+            ...state.row,
+            id: String(state.row.id)
           };
         }
       }

package/test/workspacesRepository.test.js

@@ -13,50 +13,35 @@ function createKnexStub() {
   });
 }
 
-function toWorkspaceResource(row = {}) {
+function asCollectionDocument(rows = []) {
+  return {
+    data: Array.isArray(rows) ? rows : []
+  };
+}
+
+function toWorkspaceRow(row = {}) {
   return {
-    type: "workspaces",
     id: String(row.id || ""),
-    attributes: {
-      slug: row.slug,
-      name: row.name,
-      isPersonal: row.isPersonal,
-      avatarUrl: row.avatarUrl,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt,
-      deletedAt: row.deletedAt
-    },
-    relationships: {
-      owner: {
-        data: row.ownerUserId == null
-          ? null
-          : {
-              type: "userProfiles",
-              id: String(row.ownerUserId)
-            }
-      }
-    }
+    slug: row.slug,
+    name: row.name,
+    ownerUserId: row.ownerUserId == null ? null : String(row.ownerUserId),
+    isPersonal: row.isPersonal,
+    avatarUrl: row.avatarUrl,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+    deletedAt: row.deletedAt
   };
 }
 
-function toWorkspaceMembershipResource(row = {}) {
+function toWorkspaceMembershipRow(row = {}) {
   return {
-    type: "workspaceMemberships",
     id: String(row.id || ""),
-    attributes: {
-      roleSid: row.roleSid,
-      status: row.status,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
-    },
-    relationships: {
-      user: {
-        data: row?.user?.id == null ? null : { type: "userProfiles", id: String(row.user.id) }
-      },
-      workspace: {
-        data: row?.workspace?.id == null ? null : { type: "workspaces", id: String(row.workspace.id) }
-      }
-    }
+    roleSid: row.roleSid,
+    status: row.status,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+    user: row?.user?.id == null ? null : { ...row.user, id: String(row.user.id) },
+    workspace: row?.workspace?.id == null ? null : toWorkspaceRow(row.workspace)
   };
 }
 
@@ -80,23 +65,22 @@ function createWorkspacesApiStub({
 
           if (Object.hasOwn(filters, "id")) {
             const row = rowsById.get(String(filters.id)) || null;
-            return { data: row ? [toWorkspaceResource(row)] : [] };
+            return asCollectionDocument(row ? [toWorkspaceRow(row)] : []);
           }
 
           if (Object.hasOwn(filters, "slug")) {
             const row = rowsBySlug.get(String(filters.slug)) || null;
-            return { data: row ? [toWorkspaceResource(row)] : [] };
+            return asCollectionDocument(row ? [toWorkspaceRow(row)] : []);
           }
 
           if (Object.hasOwn(filters, "owner") && Object.hasOwn(filters, "isPersonal")) {
             const rows = personalRowsByOwnerId.get(String(filters.owner)) || [];
-            return { data: rows.map((row) => toWorkspaceResource(row)) };
+            return asCollectionDocument(rows.map((row) => toWorkspaceRow(row)));
           }
 
-          return { data: [] };
+          return asCollectionDocument([]);
         },
         async post(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.postPayload = inputRecord;
           if (insertError) {
@@ -118,10 +102,9 @@ function createWorkspacesApiStub({
           if (row.slug) {
             rowsBySlug.set(row.slug, row);
           }
-          return { data: toWorkspaceResource(row) };
+          return toWorkspaceRow(row);
         },
         async patch(payload) {
-          assert.equal(payload?.simplified, false);
           const inputRecord = payload?.inputRecord?.data || {};
           state.patchPayload = inputRecord;
           const existing = rowsById.get(String(inputRecord.id)) || {
@@ -139,29 +122,21 @@ function createWorkspacesApiStub({
           if (updated.slug) {
             rowsBySlug.set(String(updated.slug), updated);
           }
-          return { data: toWorkspaceResource(updated) };
+          return toWorkspaceRow(updated);
         }
       },
       workspaceMemberships: {
         async query({ queryParams }) {
           const filters = queryParams?.filters || {};
-          const includeWorkspace = Array.isArray(queryParams?.include) && queryParams.include.includes("workspace");
           if (Object.hasOwn(filters, "user") && Object.hasOwn(filters, "status")) {
             const rows = membershipRows.filter((row) => (
               String(row?.user?.id || "") === String(filters.user) &&
               String(row?.status || "") === String(filters.status)
             ));
-            return {
-              data: rows.map((row) => toWorkspaceMembershipResource(row)),
-              included: includeWorkspace
-                ? rows
-                    .filter((row) => row?.workspace?.id != null)
-                    .map((row) => toWorkspaceResource(row.workspace))
-                : []
-            };
+            return asCollectionDocument(rows.map((row) => toWorkspaceMembershipRow(row)));
           }
 
-          return { data: [] };
+          return asCollectionDocument([]);
         }
       }
     }