@jskit-ai/workspaces-core 0.1.163 → 0.1.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-core",
-  "version": "0.1.163",
+  "version": "0.1.164",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -18,11 +18,11 @@
     "./shared/resources/workspaceSettingsResource": "./src/shared/resources/workspaceSettingsResource.js"
   },
   "dependencies": {
-    "@jskit-ai/database-runtime": "0.1.185",
-    "@jskit-ai/json-rest-api-core": "0.1.129",
-    "@jskit-ai/resource-core": "0.1.127",
-    "@jskit-ai/resource-crud-core": "0.1.127",
-    "@jskit-ai/users-core": "0.1.198",
+    "@jskit-ai/database-runtime": "0.1.186",
+    "@jskit-ai/json-rest-api-core": "0.1.130",
+    "@jskit-ai/resource-core": "0.1.128",
+    "@jskit-ai/resource-crud-core": "0.1.128",
+    "@jskit-ai/users-core": "0.1.199",
     "json-rest-schema": "^1.0.17"
   },
   "description": "Workspace tenancy runtime plus HTTP routes, role catalog, and workspace config scaffolding.",
@@ -169,8 +169,8 @@
     }
   },
   "peerDependencies": {
-    "@jskit-ai/auth-core": "0.1.183",
-    "@jskit-ai/http-runtime": "0.1.183",
-    "@jskit-ai/kernel": "0.1.185"
+    "@jskit-ai/auth-core": "0.1.184",
+    "@jskit-ai/http-runtime": "0.1.184",
+    "@jskit-ai/kernel": "0.1.186"
   }
 }

package/src/server/WorkspacesFeature.js

@@ -82,28 +82,21 @@ async function installWorkspaceResources(jsonRestApi) {
   );
 }
 
-function createWorkspacesRuntime({ config, database, env, jsonRestApi } = {}) {
+function createWorkspacesRuntime({ config, env, jsonRestApi } = {}) {
   const tenancyProfile = resolveTenancyProfile(config);
   const invitationsPolicy = resolveWorkspaceInvitationsPolicy({ config, appConfig: config, tenancyProfile });
   const invitationsEnabled = invitationsPolicy.enabled === true;
   const roleCatalog = createWorkspaceRoleCatalog(config);
   const workspaceSettingsRepository = createWorkspaceSettingsRepository({
     api: jsonRestApi,
-    knex: database.knex,
     defaultInvitesEnabled: requireBoolean(
       config?.workspaceSettings?.defaults?.invitesEnabled,
       "runtime.config.workspaceSettings.defaults.invitesEnabled"
     )
   });
-  const workspacesRepository = createWorkspacesRepository({ api: jsonRestApi, knex: database.knex });
-  const workspaceMembershipsRepository = createWorkspaceMembershipsRepository({
-    api: jsonRestApi,
-    knex: database.knex
-  });
-  const workspaceInvitesRepository = createWorkspaceInvitesRepository({
-    api: jsonRestApi,
-    knex: database.knex
-  });
+  const workspacesRepository = createWorkspacesRepository({ api: jsonRestApi });
+  const workspaceMembershipsRepository = createWorkspaceMembershipsRepository({ api: jsonRestApi });
+  const workspaceInvitesRepository = createWorkspaceInvitesRepository({ api: jsonRestApi });
   const workspaceService = createWorkspaceService({
     appConfig: config,
     workspacesRepository,
@@ -165,7 +158,6 @@ const WorkspacesFeature = defineFeature({
   requires: {
     bootstrap: "runtime.bootstrap",
     config: "runtime.config",
-    database: "runtime.database",
     env: "runtime.env",
     http: "runtime.http",
     jsonRestApi: "runtime.json-rest-api",
@@ -174,9 +166,9 @@ const WorkspacesFeature = defineFeature({
   provides: {
     workspaces: "workspaces.core"
   },
-  async setup({ bootstrap, config, database, env, http, jsonRestApi, users }) {
+  async setup({ bootstrap, config, env, http, jsonRestApi, users }) {
     await installWorkspaceResources(jsonRestApi);
-    const workspaces = createWorkspacesRuntime({ config, database, env, jsonRestApi });
+    const workspaces = createWorkspacesRuntime({ config, env, jsonRestApi });
 
     bootstrap.register({
       id: "workspaces.bootstrap",

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

@@ -1,7 +1,6 @@
 import {
   normalizeDbRecordId,
-  toIsoString,
-  createWithTransaction
+  toIsoString
 } from "@jskit-ai/database-runtime/shared";
 import { isDuplicateEntryError } from "@jskit-ai/database-runtime/shared/duplicateEntry";
 import { normalizeLowerText, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
@@ -38,6 +37,5 @@ export {
   normalizeDbRecordId,
   uniqueSorted,
   parseJson,
-  toDbJson,
-  createWithTransaction
+  toDbJson
 };

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

@@ -1,5 +1,4 @@
 import {
-  createWithTransaction,
   normalizeLowerText,
   normalizeRecordId,
   normalizeDbRecordId,
@@ -8,14 +7,10 @@ import {
   toIsoString
 } from "./repositoryUtils.js";
 import {
-  createJsonApiInputRecord,
-  createJsonApiRelationship,
   createJsonRestContext,
   extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 
-const RESOURCE_TYPE = "workspaceInvites";
-
 function normalizeInviteRecord(payload) {
   if (!payload) {
     return null;
@@ -80,28 +75,12 @@ function normalizeInviteWithWorkspace(payload = {}) {
   };
 }
 
-function createInviteRelationships({ workspaceId = null, invitedByUserId = undefined } = {}) {
-  const relationships = {};
-
-  if (workspaceId) {
-    relationships.workspace = createJsonApiRelationship("workspaces", workspaceId);
-  }
-  if (invitedByUserId !== undefined) {
-    relationships.invitedByUser = createJsonApiRelationship("userProfiles", invitedByUserId);
-  }
-
-  return relationships;
-}
-
-function createRepository({ api, knex } = {}) {
+function createRepository({ api } = {}) {
   if (!api?.resources?.workspaceInvites) {
     throw new TypeError("workspaceInvitesRepository requires json-rest-api workspaceInvites resource.");
   }
-  if (typeof knex !== "function") {
-    throw new TypeError("workspaceInvitesRepository requires knex.");
-  }
 
-  const withTransaction = createWithTransaction(knex);
+  const withTransaction = (work) => api.transaction(work);
 
   async function queryInvites(filters = {}, options = {}, { includeWorkspace = false } = {}) {
     return extractJsonRestCollectionRows(
@@ -112,7 +91,7 @@ function createRepository({ api, knex } = {}) {
             ...(includeWorkspace ? { include: ["workspace"] } : {})
           },
           transaction: options?.trx || null,
-          simplified: true
+          format: "plain"
         },
         createJsonRestContext(options?.context || null)
       )
@@ -210,26 +189,21 @@ function createRepository({ api, knex } = {}) {
       const createdAt = new Date().toISOString();
       const created = await api.resources.workspaceInvites.post(
         {
-          inputRecord: createJsonApiInputRecord(
-            RESOURCE_TYPE,
-            {
-              email: createPayload.email,
-              roleSid: createPayload.roleSid,
-              status: createPayload.status,
-              tokenHash: createPayload.tokenHash,
-              expiresAt: createPayload.expiresAt == null ? null : toIsoString(createPayload.expiresAt),
-              acceptedAt: null,
-              revokedAt: null,
-              createdAt,
-              updatedAt: createdAt
-            },
-            {
-              relationships: createInviteRelationships({
-                workspaceId: createPayload.workspaceId,
-                invitedByUserId: createPayload.invitedByUserId ?? null
-              })
-            }
-          ),
+          data: {
+            email: createPayload.email,
+            roleSid: createPayload.roleSid,
+            status: createPayload.status,
+            tokenHash: createPayload.tokenHash,
+            expiresAt: createPayload.expiresAt == null ? null : toIsoString(createPayload.expiresAt),
+            acceptedAt: null,
+            revokedAt: null,
+            createdAt,
+            updatedAt: createdAt,
+            workspace: createPayload.workspaceId,
+            invitedByUser: createPayload.invitedByUserId ?? null
+          },
+          format: "plain",
+          returning: "full",
           transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
@@ -237,7 +211,7 @@ function createRepository({ api, knex } = {}) {
 
       return normalizeInviteRecord(created);
     } catch (error) {
-      if (!isDuplicateEntryError(error)) {
+      if (options?.trx || error?.transactionOutcome !== "rolledBack" || !isDuplicateEntryError(error)) {
         throw error;
       }
     }
@@ -277,16 +251,13 @@ function createRepository({ api, knex } = {}) {
       }
       await api.resources.workspaceInvites.patch(
         {
-          inputRecord: createJsonApiInputRecord(
-            RESOURCE_TYPE,
-            {
-              status: patch.status,
-              updatedAt: new Date().toISOString()
-            },
-            {
-              id: row.id
-            }
-          ),
+          id: row.id,
+          data: {
+            status: patch.status,
+            updatedAt: new Date().toISOString()
+          },
+          format: "plain",
+          returning: "full",
           transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
@@ -303,17 +274,14 @@ function createRepository({ api, knex } = {}) {
     const acceptedAt = new Date().toISOString();
     await api.resources.workspaceInvites.patch(
       {
-        inputRecord: createJsonApiInputRecord(
-          RESOURCE_TYPE,
-          {
-            status: "accepted",
-            acceptedAt,
-            updatedAt: acceptedAt
-          },
-          {
-            id: normalizedInviteId
-          }
-        ),
+        id: normalizedInviteId,
+        data: {
+          status: "accepted",
+          acceptedAt,
+          updatedAt: acceptedAt
+        },
+        format: "plain",
+        returning: "full",
         transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
@@ -329,17 +297,14 @@ function createRepository({ api, knex } = {}) {
     const revokedAt = new Date().toISOString();
     await api.resources.workspaceInvites.patch(
       {
-        inputRecord: createJsonApiInputRecord(
-          RESOURCE_TYPE,
-          {
-            status: "revoked",
-            revokedAt,
-            updatedAt: revokedAt
-          },
-          {
-            id: normalizedInviteId
-          }
-        ),
+        id: normalizedInviteId,
+        data: {
+          status: "revoked",
+          revokedAt,
+          updatedAt: revokedAt
+        },
+        format: "plain",
+        returning: "full",
         transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)

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

@@ -1,5 +1,4 @@
 import {
-  createWithTransaction,
   normalizeLowerText,
   normalizeRecordId,
   normalizeDbRecordId,
@@ -8,15 +7,11 @@ import {
   toIsoString
 } from "./repositoryUtils.js";
 import {
-  createJsonApiInputRecord,
-  createJsonApiRelationship,
   createJsonRestContext,
   extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { OWNER_ROLE_ID } from "../../../shared/roles.js";
 
-const RESOURCE_TYPE = "workspaceMemberships";
-
 function normalizeMembershipRecord(payload) {
   if (!payload) {
     return null;
@@ -61,28 +56,12 @@ function normalizeMemberSummaryRow(row) {
   };
 }
 
-function createMembershipRelationships({ workspaceId = null, userId = null } = {}) {
-  const relationships = {};
-
-  if (workspaceId) {
-    relationships.workspace = createJsonApiRelationship("workspaces", workspaceId);
-  }
-  if (userId) {
-    relationships.user = createJsonApiRelationship("userProfiles", userId);
-  }
-
-  return relationships;
-}
-
-function createRepository({ api, knex } = {}) {
+function createRepository({ api } = {}) {
   if (!api?.resources?.workspaceMemberships) {
     throw new TypeError("workspaceMembershipsRepository requires json-rest-api workspaceMemberships resource.");
   }
-  if (typeof knex !== "function") {
-    throw new TypeError("workspaceMembershipsRepository requires knex.");
-  }
 
-  const withTransaction = createWithTransaction(knex);
+  const withTransaction = (work) => api.transaction(work);
 
   async function queryMemberships(filters = {}, options = {}, { include = [] } = {}) {
     const normalizedInclude = Array.from(
@@ -100,7 +79,7 @@ function createRepository({ api, knex } = {}) {
             ...(normalizedInclude.length > 0 ? { include: normalizedInclude } : {})
           },
           transaction: options?.trx || null,
-          simplified: true
+          format: "plain"
         },
         createJsonRestContext(options?.context || null)
       )
@@ -139,17 +118,14 @@ function createRepository({ api, knex } = {}) {
         const updatedAt = new Date().toISOString();
         await api.resources.workspaceMemberships.patch(
           {
-            inputRecord: createJsonApiInputRecord(
-              RESOURCE_TYPE,
-              {
-                roleSid: OWNER_ROLE_ID,
-                status: "active",
-                updatedAt
-              },
-              {
-                id: existing.id
-              }
-            ),
+            id: existing.id,
+            data: {
+              roleSid: OWNER_ROLE_ID,
+              status: "active",
+              updatedAt
+            },
+            format: "plain",
+            returning: "full",
             transaction: options?.trx || null
           },
           createJsonRestContext(options?.context || null)
@@ -162,27 +138,22 @@ function createRepository({ api, knex } = {}) {
       const createdAt = new Date().toISOString();
       await api.resources.workspaceMemberships.post(
         {
-          inputRecord: createJsonApiInputRecord(
-            RESOURCE_TYPE,
-            {
-              roleSid: OWNER_ROLE_ID,
-              status: "active",
-              createdAt,
-              updatedAt: createdAt
-            },
-            {
-              relationships: createMembershipRelationships({
-                workspaceId: normalizedWorkspaceId,
-                userId: normalizedUserId
-              })
-            }
-          ),
+          data: {
+            roleSid: OWNER_ROLE_ID,
+            status: "active",
+            createdAt,
+            updatedAt: createdAt,
+            workspace: normalizedWorkspaceId,
+            user: normalizedUserId
+          },
+          format: "plain",
+          returning: "full",
           transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
       );
     } catch (error) {
-      if (!isDuplicateEntryError(error)) {
+      if (options?.trx || error?.transactionOutcome !== "rolledBack" || !isDuplicateEntryError(error)) {
         throw error;
       }
     }
@@ -210,27 +181,22 @@ function createRepository({ api, knex } = {}) {
         const createdAt = new Date().toISOString();
         await api.resources.workspaceMemberships.post(
           {
-            inputRecord: createJsonApiInputRecord(
-              RESOURCE_TYPE,
-              {
-                roleSid,
-                status,
-                createdAt,
-                updatedAt: createdAt
-              },
-              {
-                relationships: createMembershipRelationships({
-                  workspaceId: normalizedWorkspaceId,
-                  userId: normalizedUserId
-                })
-              }
-            ),
+            data: {
+              roleSid,
+              status,
+              createdAt,
+              updatedAt: createdAt,
+              workspace: normalizedWorkspaceId,
+              user: normalizedUserId
+            },
+            format: "plain",
+            returning: "full",
             transaction: options?.trx || null
           },
           createJsonRestContext(options?.context || null)
         );
       } catch (error) {
-        if (!isDuplicateEntryError(error)) {
+        if (options?.trx || error?.transactionOutcome !== "rolledBack" || !isDuplicateEntryError(error)) {
           throw error;
         }
       }
@@ -240,17 +206,14 @@ function createRepository({ api, knex } = {}) {
     const updatedAt = new Date().toISOString();
     await api.resources.workspaceMemberships.patch(
       {
-        inputRecord: createJsonApiInputRecord(
-          RESOURCE_TYPE,
-          {
-            roleSid,
-            status,
-            updatedAt
-          },
-          {
-            id: existing.id
-          }
-        ),
+        id: existing.id,
+        data: {
+          roleSid,
+          status,
+          updatedAt
+        },
+        format: "plain",
+        returning: "full",
         transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)

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

@@ -1,19 +1,14 @@
 import {
-  createWithTransaction,
   normalizeRecordId,
   isDuplicateEntryError,
   normalizeText,
   toIsoString
 } from "./repositoryUtils.js";
 import {
-  createJsonApiInputRecord,
-  createJsonApiRelationship,
   createJsonRestContext,
   extractJsonRestCollectionRows
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 
-const RESOURCE_TYPE = "workspaces";
-
 function normalizeWorkspaceRecord(payload = null) {
   if (!payload || typeof payload !== "object") {
     return null;
@@ -32,26 +27,12 @@ function normalizeWorkspaceRecord(payload = null) {
   };
 }
 
-function createWorkspaceRelationships(source = {}) {
-  const relationships = {};
-  const ownerUserId = normalizeRecordId(source.ownerUserId, { fallback: null });
-
-  if (ownerUserId) {
-    relationships.owner = createJsonApiRelationship("userProfiles", ownerUserId);
-  }
-
-  return relationships;
-}
-
-function createRepository({ api, knex } = {}) {
+function createRepository({ api } = {}) {
   if (!api?.resources?.workspaces || !api?.resources?.workspaceMemberships) {
     throw new TypeError("workspacesRepository requires json-rest-api workspaces and workspaceMemberships resources.");
   }
-  if (typeof knex !== "function") {
-    throw new TypeError("workspacesRepository requires knex.");
-  }
 
-  const withTransaction = createWithTransaction(knex);
+  const withTransaction = (work) => api.transaction(work);
 
   async function queryFirst(filters = {}, options = {}) {
     const rows = extractJsonRestCollectionRows(
@@ -61,7 +42,7 @@ function createRepository({ api, knex } = {}) {
             filters
           },
           transaction: options?.trx || null,
-          simplified: true
+          format: "plain"
         },
         createJsonRestContext(options?.context || null)
       )
@@ -104,7 +85,7 @@ function createRepository({ api, knex } = {}) {
             }
           },
           transaction: options?.trx || null,
-          simplified: true
+          format: "plain"
         },
         createJsonRestContext(options?.context || null)
       )
@@ -140,17 +121,14 @@ function createRepository({ api, knex } = {}) {
       const createdAt = new Date().toISOString();
       const created = await api.resources.workspaces.post(
         {
-          inputRecord: createJsonApiInputRecord(
-            RESOURCE_TYPE,
-            {
-              ...createPayload,
-              createdAt,
-              updatedAt: createdAt
-            },
-            {
-              relationships: createWorkspaceRelationships({ ownerUserId })
-            }
-          ),
+          data: {
+            ...createPayload,
+            createdAt,
+            updatedAt: createdAt,
+            owner: ownerUserId
+          },
+          format: "plain",
+          returning: "full",
           transaction: options?.trx || null
         },
         createJsonRestContext(options?.context || null)
@@ -158,7 +136,7 @@ function createRepository({ api, knex } = {}) {
 
       return normalizeWorkspaceRecord(created);
     } catch (error) {
-      if (!isDuplicateEntryError(error)) {
+      if (options?.trx || error?.transactionOutcome !== "rolledBack" || !isDuplicateEntryError(error)) {
         throw error;
       }
       if (!Object.hasOwn(createPayload, "slug")) {
@@ -184,18 +162,17 @@ function createRepository({ api, knex } = {}) {
       ...sourcePatch,
       updatedAt: new Date().toISOString()
     };
-    const relationships = createWorkspaceRelationships(sourcePatch);
+    delete workspacePatch.ownerUserId;
+    if (Object.hasOwn(sourcePatch, "ownerUserId")) {
+      workspacePatch.owner = normalizeRecordId(sourcePatch.ownerUserId, { fallback: null });
+    }
 
     const updated = await api.resources.workspaces.patch(
       {
-        inputRecord: createJsonApiInputRecord(
-          RESOURCE_TYPE,
-          workspacePatch,
-          {
-            id: normalizedWorkspaceId,
-            relationships
-          }
-        ),
+        id: normalizedWorkspaceId,
+        data: workspacePatch,
+        format: "plain",
+        returning: "full",
         transaction: options?.trx || null
       },
       createJsonRestContext(options?.context || null)
@@ -221,7 +198,7 @@ function createRepository({ api, knex } = {}) {
             include: ["workspace"]
           },
           transaction: options?.trx || null,
-          simplified: true
+          format: "plain"
         },
         createJsonRestContext(options?.context || null)
       )