@arcote.tech/arc-workspace 0.4.6 → 0.4.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcote.tech/arc-workspace",
   "type": "module",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "private": false,
   "description": "Reusable workspace module for Arc framework — multi-workspace with dual token architecture",
   "main": "./src/index.ts",
@@ -10,8 +10,8 @@
     "type-check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@arcote.tech/arc": "^0.4.6",
-    "@arcote.tech/arc-auth": "^0.4.6",
+    "@arcote.tech/arc": "^0.4.7",
+    "@arcote.tech/arc-auth": "^0.4.7",
     "typescript": "^5.0.0"
   },
   "devDependencies": {

package/src/aggregates/workspace-member.ts

@@ -2,7 +2,7 @@ import {
   aggregate,
   date,
   string,
-  type AggregateConstructorAny,
+  type ArcAggregateElement,
   type ArcId,
 } from "@arcote.tech/arc";
 import type { Token } from "@arcote.tech/arc-auth";
@@ -15,7 +15,7 @@ export type WorkspaceMemberAggregateData = {
   accountId: ArcId<any>;
   workspaceToken: WorkspaceToken;
   userToken: Token;
-  WorkspaceAggregate: AggregateConstructorAny;
+  WorkspaceAggregate: ArcAggregateElement<any, any, any, any, any, any>;
 };
 
 export const createWorkspaceMemberAggregate = <
@@ -206,11 +206,9 @@ export const createWorkspaceMemberAggregate = <
 
     .protectBy(userToken, (params: any) => ({ accountId: params.accountId }))
     .clientQuery("getAll", async (ctx) => ctx.$query.find({}))
-    .build();
+;
 
-  class WorkspaceMember extends Constructor {}
-
-  return WorkspaceMember;
+  return Constructor;
 };
 
 export type WorkspaceMemberAggregate<

package/src/aggregates/workspace.ts

@@ -115,7 +115,7 @@ export const createWorkspaceAggregate = <
     )
 
     .clientQuery("getAll", async (ctx) => ctx.$query.find({}))
-    .build();
+;
 };
 
 export type WorkspaceAggregate<

package/src/workspace-builder.ts

@@ -1,9 +1,7 @@
 import {
-  aggregateContextElement,
   context,
   type ArcAggregateElement,
   type ArcContextElement,
-  type AggregateConstructorAny,
 } from "@arcote.tech/arc";
 import type { AccountId, Token } from "@arcote.tech/arc-auth";
 import { createWorkspaceId } from "./ids/workspace";
@@ -16,10 +14,8 @@ export class WorkspaceBuilder<
   WsId,
   WsMemberId,
   WsToken,
-  Workspace extends AggregateConstructorAny,
-  WorkspaceEl extends ArcAggregateElement<Workspace>,
-  WorkspaceMember extends AggregateConstructorAny,
-  WorkspaceMemberEl extends ArcAggregateElement<WorkspaceMember>,
+  Workspace extends ArcAggregateElement,
+  WorkspaceMember extends ArcAggregateElement,
   Types extends readonly string[],
   Elements extends ArcContextElement<any>[],
 > {
@@ -29,9 +25,7 @@ export class WorkspaceBuilder<
     readonly workspaceMemberId: WsMemberId,
     readonly workspaceToken: WsToken,
     readonly Workspace: Workspace,
-    readonly workspaceElement: WorkspaceEl,
     readonly WorkspaceMember: WorkspaceMember,
-    readonly workspaceMemberElement: WorkspaceMemberEl,
     readonly types: Types,
     readonly elements: Elements,
   ) {}
@@ -45,7 +39,6 @@ export class WorkspaceBuilder<
       Workspace: this.Workspace,
       WorkspaceMember: this.WorkspaceMember,
       types: this.types,
-      // Protection helpers
       isOwner: (params: { role: string }) => params.role === "owner",
       isMember: (params: { role: string }) =>
         params.role === "member" || params.role === "owner",
@@ -80,7 +73,6 @@ export function workspace<
     accountId: config.accountId,
     workspaceToken,
   });
-  const workspaceElement = aggregateContextElement(Workspace);
 
   const WorkspaceMember = createWorkspaceMemberAggregate({
     name: config.name,
@@ -91,9 +83,6 @@ export function workspace<
     userToken: config.userToken,
     WorkspaceAggregate: Workspace,
   });
-  const workspaceMemberElement = aggregateContextElement(WorkspaceMember);
-
-  const elements = [workspaceElement, workspaceMemberElement];
 
   return new WorkspaceBuilder(
     config.name,
@@ -101,10 +90,8 @@ export function workspace<
     workspaceMemberId,
     workspaceToken,
     Workspace,
-    workspaceElement,
     WorkspaceMember,
-    workspaceMemberElement,
     config.types,
-    elements,
+    [Workspace, WorkspaceMember],
   );
 }