@jskit-ai/workspaces-core 0.1.42 → 0.1.44

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-core",
-  version: "0.1.42",
+  version: "0.1.44",
   kind: "runtime",
   description: "Workspace tenancy runtime plus HTTP routes, role catalog, and workspace config scaffolding.",
   dependsOn: [
@@ -142,10 +142,10 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/json-rest-api-core": "0.1.11",
-        "@jskit-ai/resource-core": "0.1.11",
-        "@jskit-ai/resource-crud-core": "0.1.11",
-        "@jskit-ai/users-core": "0.1.76"
+        "@jskit-ai/json-rest-api-core": "0.1.13",
+        "@jskit-ai/resource-core": "0.1.13",
+        "@jskit-ai/resource-crud-core": "0.1.13",
+        "@jskit-ai/users-core": "0.1.78"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-core",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "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.65",
-    "@jskit-ai/database-runtime": "0.1.66",
-    "@jskit-ai/http-runtime": "0.1.65",
-    "@jskit-ai/json-rest-api-core": "0.1.11",
-    "@jskit-ai/kernel": "0.1.66",
-    "@jskit-ai/resource-crud-core": "0.1.11",
-    "@jskit-ai/resource-core": "0.1.11",
-    "@jskit-ai/users-core": "0.1.76",
+    "@jskit-ai/auth-core": "0.1.67",
+    "@jskit-ai/database-runtime": "0.1.68",
+    "@jskit-ai/http-runtime": "0.1.67",
+    "@jskit-ai/json-rest-api-core": "0.1.13",
+    "@jskit-ai/kernel": "0.1.68",
+    "@jskit-ai/resource-crud-core": "0.1.13",
+    "@jskit-ai/resource-core": "0.1.13",
+    "@jskit-ai/users-core": "0.1.78",
     "json-rest-schema": "1.x.x"
   }
 }

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

@@ -119,7 +119,8 @@ function createRepository({ api, knex } = {}) {
         workspace: normalizedWorkspaceId,
         user: normalizedUserId
       },
-      options
+      options,
+      { include: ["workspace", "user"] }
     );
 
     return normalizeMembershipRecord(rows[0] || null);
@@ -289,13 +290,17 @@ function createRepository({ api, knex } = {}) {
       return [];
     }
 
-    const rows = await queryMemberships({
-      user: normalizedUserId,
-      status: "active"
-    }, options);
+    const rows = await queryMemberships(
+      {
+        user: normalizedUserId,
+        status: "active"
+      },
+      options,
+      { include: ["workspace"] }
+    );
 
     return rows
-      .map((row) => normalizeDbRecordId(row?.workspaceId, { fallback: null }))
+      .map((row) => normalizeDbRecordId(row?.workspace?.id || row?.workspaceId, { fallback: null }))
       .filter(Boolean);
   }
 

package/src/shared/resources/workspaceInvitesResource.js

@@ -5,7 +5,11 @@ const workspaceInvitesResource = defineCrudResource({
   namespace: "workspaceInvites",
   tableName: "workspace_invites",
   searchSchema: {
-    id: { type: "id", actualField: "id" }
+    id: { type: "id", actualField: "id" },
+    workspace: { type: "id", actualField: "workspace_id", filterOperator: "=" },
+    email: { type: "string", actualField: "email", filterOperator: "=" },
+    status: { type: "string", actualField: "status", filterOperator: "=" },
+    tokenHash: { type: "string", actualField: "token_hash", filterOperator: "=" }
   },
   schema: {
     workspaceId: {

package/src/shared/resources/workspaceMembershipsResource.js

@@ -5,7 +5,10 @@ const workspaceMembershipsResource = defineCrudResource({
   namespace: "workspaceMemberships",
   tableName: "workspace_memberships",
   searchSchema: {
-    id: { type: "id", actualField: "id" }
+    id: { type: "id", actualField: "id" },
+    workspace: { type: "id", actualField: "workspace_id", filterOperator: "=" },
+    user: { type: "id", actualField: "user_id", filterOperator: "=" },
+    status: { type: "string", actualField: "status", filterOperator: "=" }
   },
   schema: {
     workspaceId: {

package/src/shared/resources/workspaceResource.js

@@ -61,7 +61,10 @@ const resource = defineCrudResource({
   namespace: "workspace",
   tableName: "workspaces",
   searchSchema: {
-    id: { type: "id", actualField: "id" }
+    id: { type: "id", actualField: "id" },
+    slug: { type: "string", actualField: "slug", filterOperator: "=" },
+    owner: { type: "id", actualField: "owner_user_id", filterOperator: "=" },
+    isPersonal: { type: "boolean", actualField: "is_personal", filterOperator: "=" }
   },
   schema: {
     slug: {

package/test/resourcesCanonical.test.js

@@ -55,6 +55,20 @@ test("workspaces-core resources expose messages for all operations", () => {
   }
 });
 
+test("workspaces-core repository filters are declared on canonical resources", () => {
+  assert.deepEqual(Object.keys(workspaceResource.searchSchema), ["id", "slug", "owner", "isPersonal"]);
+  assert.equal(workspaceResource.searchSchema.slug.actualField, "slug");
+  assert.equal(workspaceResource.searchSchema.owner.actualField, "owner_user_id");
+
+  assert.deepEqual(Object.keys(workspaceMembershipsResource.searchSchema), ["id", "workspace", "user", "status"]);
+  assert.equal(workspaceMembershipsResource.searchSchema.workspace.actualField, "workspace_id");
+  assert.equal(workspaceMembershipsResource.searchSchema.user.actualField, "user_id");
+
+  assert.deepEqual(Object.keys(workspaceInvitesResource.searchSchema), ["id", "workspace", "email", "status", "tokenHash"]);
+  assert.equal(workspaceInvitesResource.searchSchema.workspace.actualField, "workspace_id");
+  assert.equal(workspaceInvitesResource.searchSchema.tokenHash.actualField, "token_hash");
+});
+
 test("workspaces-core specialized resource operations expose messages and validators", () => {
   const operationSpecs = [
     { label: "workspaceMembers.rolesList", operation: workspaceMembersResource.operations.rolesList },

package/test/workspaceMembershipsRepository.test.js

@@ -24,12 +24,10 @@ function asCollectionDocument(rows = []) {
 function toWorkspaceMembershipRow(row = {}) {
   return {
     id: String(row.id || ""),
-    workspaceId: row?.workspace?.id == null ? null : String(row.workspace.id),
     workspace: row?.workspace?.id == null ? null : {
       ...row.workspace,
       id: String(row.workspace.id)
     },
-    userId: row?.user?.id == null ? null : String(row.user.id),
     user: row?.user?.id == null
       ? null
       : {
@@ -63,8 +61,16 @@ function createWorkspaceMembershipsApiStub({
           const includeUser = Array.isArray(queryParams?.include) && queryParams.include.includes("user");
 
           if (Object.hasOwn(filters, "workspace") && Object.hasOwn(filters, "user")) {
+            const includeWorkspace = Array.isArray(queryParams?.include) && queryParams.include.includes("workspace");
+            const includeUser = Array.isArray(queryParams?.include) && queryParams.include.includes("user");
             const row = rowByComposite.get(`${filters.workspace}:${filters.user}`) || null;
-            return asCollectionDocument(row ? [toWorkspaceMembershipRow(row)] : []);
+            return asCollectionDocument(row
+              ? [toWorkspaceMembershipRow({
+                  ...row,
+                  workspace: includeWorkspace ? row.workspace : null,
+                  user: includeUser ? row.user : null
+                })]
+              : []);
           }
 
           if (Object.hasOwn(filters, "workspace") && Object.hasOwn(filters, "status") && includeUser) {
@@ -86,8 +92,7 @@ function createWorkspaceMembershipsApiStub({
                 ...toWorkspaceMembershipRow({
                   ...row,
                   workspace: null
-                }),
-                workspaceId: row?.workspace?.id == null ? null : String(row.workspace.id)
+                })
               };
             }));
           }
@@ -277,7 +282,8 @@ test("workspaceMembershipsRepository.listActiveWorkspaceIdsByUserId returns norm
       filters: {
         user: "9",
         status: "active"
-      }
+      },
+      include: ["workspace"]
     }
   ]);
 });