@peers-app/peers-sdk 0.7.2 → 0.7.5

package/dist/data/group-members.js

@@ -1,16 +1,51 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupMembersTable = exports.groupMembersTableName = exports.groupMemberSchema = void 0;
 exports.GroupMembers = GroupMembers;
 const zod_1 = require("zod");
 const user_context_singleton_1 = require("../context/user-context-singleton");
+const decorators_1 = require("../data/orm/decorators");
 const zod_types_1 = require("../types/zod-types");
-const orm_1 = require("./orm");
-const table_definitions_system_1 = require("./orm/table-definitions.system");
-const types_1 = require("./orm/types");
 const group_member_roles_1 = require("./group-member-roles");
 const group_permissions_1 = require("./group-permissions");
-const __1 = require("..");
+const table_1 = require("./orm/table");
+const table_definitions_system_1 = require("./orm/table-definitions.system");
+const types_1 = require("./orm/types");
+const users_1 = require("./users");
 exports.groupMemberSchema = zod_1.z.object({
     groupMemberId: zod_types_1.zodPeerId,
     groupId: zod_types_1.zodPeerId.describe('The id of the group'),
@@ -29,38 +64,69 @@ const metaData = {
         { fields: ['groupId', 'userId'], unique: true },
     ]
 };
-class GroupMembersTable extends orm_1.Table {
-    static isPassthrough = false;
-    async save(groupMember, opts) {
-        if (GroupMembersTable.isPassthrough) {
-            return super.save(groupMember, opts);
+let GroupMembersTable = (() => {
+    let _classSuper = table_1.Table;
+    let _instanceExtraInitializers = [];
+    let _signAndSave_decorators;
+    return class GroupMembersTable extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _signAndSave_decorators = [(0, decorators_1.ProxyClientTableMethodCalls)()];
+            __esDecorate(this, null, _signAndSave_decorators, { kind: "method", name: "signAndSave", static: false, private: false, access: { has: obj => "signAndSave" in obj, get: obj => obj.signAndSave }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
-        const oldGroupMember = groupMember.groupMemberId ? await this.get(groupMember.groupMemberId) : undefined;
-        if (await (0, group_permissions_1.isGroupMemberSignatureValid)(groupMember.groupId, groupMember, oldGroupMember)) {
-            return super.save(groupMember, opts);
+        static isPassthrough = false;
+        async save(groupMember, opts) {
+            if (GroupMembersTable.isPassthrough) {
+                return super.save(groupMember, opts);
+            }
+            const me = await (0, users_1.getMe)();
+            if (groupMember.groupId === me.userId) {
+                throw new Error('Group members cannot be added to personal user contexts');
+            }
+            const oldGroupMember = groupMember.groupMemberId ? await this.get(groupMember.groupMemberId) : undefined;
+            if (await (0, group_permissions_1.isGroupMemberSignatureValid)(groupMember.groupId, groupMember, oldGroupMember)) {
+                return super.save(groupMember, opts);
+            }
+            throw new Error('Group member signature is not valid');
         }
-        throw new Error('Group member signature is not valid');
-    }
-    async delete(groupMemberId) {
-        if (GroupMembersTable.isPassthrough) {
-            return super.delete(groupMemberId);
+        async signAndSave(groupMember, opts) {
+            if (!GroupMembersTable.addSignatureToGroupMember) {
+                throw new Error('Group member signing must be enabled to sign and save group members. Call GroupMembersTable.enableGroupMemberSigning(fn) to enable it.');
+            }
+            groupMember = GroupMembersTable.addSignatureToGroupMember(groupMember);
+            return this.save(groupMember, opts);
         }
-        const groupMember = await this.get(groupMemberId);
-        if (groupMember) {
-            groupMember.deleted = true;
-            groupMember.role = group_member_roles_1.GroupMemberRole.None;
-            await __1.rpcServerCalls.tableSave(groupMember.groupId, "GroupMembers", groupMember);
+        async delete(groupMemberId) {
+            if (GroupMembersTable.isPassthrough) {
+                return super.delete(groupMemberId);
+            }
+            const groupMember = await this.get(groupMemberId);
+            if (groupMember) {
+                groupMember.deleted = true;
+                groupMember.role = group_member_roles_1.GroupMemberRole.None;
+                // we do a soft delete by saving the object with deleted=true and
+                await this.signAndSave(groupMember);
+            }
         }
-    }
-    /** @deprecated Forbidden on GroupsTable; use save() */
-    insert(..._args) {
-        throw new Error('GroupsTable forbids insert; use save()');
-    }
-    /** @deprecated Forbidden on GroupsTable; use save() */
-    update(..._args) {
-        throw new Error('GroupsTable forbids update; use save()');
-    }
-}
+        static addSignatureToGroupMember = undefined;
+        static enableGroupMemberSigning(fn) {
+            GroupMembersTable.addSignatureToGroupMember = fn;
+        }
+        /** @deprecated Forbidden on GroupsTable; use save() */
+        insert(..._args) {
+            throw new Error('GroupsTable forbids insert; use save()');
+        }
+        /** @deprecated Forbidden on GroupsTable; use save() */
+        update(..._args) {
+            throw new Error('GroupsTable forbids update; use save()');
+        }
+        constructor() {
+            super(...arguments);
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+    };
+})();
 exports.GroupMembersTable = GroupMembersTable;
 (0, table_definitions_system_1.registerSystemTableDefinition)(metaData, exports.groupMemberSchema, GroupMembersTable);
 function GroupMembers(dataContext) {

package/dist/data/groups.d.ts

@@ -1,7 +1,8 @@
 import { z } from "zod";
 import type { DataContext } from "../context/data-context";
 import { GroupMemberRole } from "./group-member-roles";
-import { ISaveOptions, Table } from "./orm";
+import type { ISaveOptions } from "./orm/data-query";
+import { Table } from "./orm/table";
 export declare const groupSchema: z.ZodObject<{
     groupId: z.ZodEffects<z.ZodString, string, string>;
     name: z.ZodString;
@@ -18,9 +19,9 @@ export declare const groupSchema: z.ZodObject<{
     description: string;
     signature: string;
     publicKey: string;
+    publicBoxKey: string;
     groupId: string;
     founderUserId: string;
-    publicBoxKey: string;
     disabled?: boolean | undefined;
     iconClassName?: string | undefined;
     publicRole?: GroupMemberRole | undefined;
@@ -29,9 +30,9 @@ export declare const groupSchema: z.ZodObject<{
     description: string;
     signature: string;
     publicKey: string;
+    publicBoxKey: string;
     groupId: string;
     founderUserId: string;
-    publicBoxKey: string;
     disabled?: boolean | undefined;
     iconClassName?: string | undefined;
     publicRole?: GroupMemberRole | undefined;
@@ -41,7 +42,10 @@ export declare const groupsTableName = "Groups";
 export declare class GroupsTable extends Table<IGroup> {
     static isPassthrough: boolean;
     save(group: IGroup, opts?: ISaveOptions): Promise<IGroup>;
+    signAndSave(group: IGroup, opts?: ISaveOptions): Promise<IGroup>;
     delete(groupId: string): Promise<void>;
+    private static addSignatureToGroup;
+    static enableGroupSigning(fn: (group: IGroup) => IGroup): void;
     /** @deprecated Direct inserts forbidden; use save() */
     insert(..._args: Parameters<Table<IGroup>['insert']>): never;
     /** @deprecated Direct updates forbidden; use save() */

package/dist/data/groups.js

@@ -1,4 +1,38 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupsTable = exports.groupsTableName = exports.groupSchema = void 0;
 exports.Groups = Groups;
@@ -7,7 +41,8 @@ const user_context_singleton_1 = require("../context/user-context-singleton");
 const zod_types_1 = require("../types/zod-types");
 const group_member_roles_1 = require("./group-member-roles");
 const group_permissions_1 = require("./group-permissions");
-const orm_1 = require("./orm");
+const decorators_1 = require("./orm/decorators");
+const table_1 = require("./orm/table");
 const table_definitions_system_1 = require("./orm/table-definitions.system");
 const types_1 = require("./orm/types");
 exports.groupSchema = zod_1.z.object({
@@ -33,39 +68,65 @@ const metaData = {
         { fields: ['name'] },
     ]
 };
-class GroupsTable extends orm_1.Table {
-    static isPassthrough = false;
-    async save(group, opts) {
-        if (GroupsTable.isPassthrough) {
-            return super.save(group, opts);
+let GroupsTable = (() => {
+    let _classSuper = table_1.Table;
+    let _instanceExtraInitializers = [];
+    let _signAndSave_decorators;
+    return class GroupsTable extends _classSuper {
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _signAndSave_decorators = [(0, decorators_1.ProxyClientTableMethodCalls)()];
+            __esDecorate(this, null, _signAndSave_decorators, { kind: "method", name: "signAndSave", static: false, private: false, access: { has: obj => "signAndSave" in obj, get: obj => obj.signAndSave }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
-        const userContext = await (0, user_context_singleton_1.getUserContext)();
-        const userContextGroups = Groups(userContext.userDataContext);
-        if (userContextGroups === this) {
-            // users can do whatever they want to groups in their personal space
+        static isPassthrough = false;
+        async save(group, opts) {
+            if (GroupsTable.isPassthrough) {
+                return super.save(group, opts);
+            }
+            const userContext = await (0, user_context_singleton_1.getUserContext)();
+            const userContextGroups = Groups(userContext.userDataContext);
+            if (userContextGroups === this) {
+                // users can do whatever they want to groups in their personal space
+                return super.save(group, opts);
+            }
+            const oldGroup = await this.get(group.groupId);
+            await (0, group_permissions_1.verifyGroupSignature)(group, oldGroup);
             return super.save(group, opts);
         }
-        const oldGroup = await this.get(group.groupId);
-        await (0, group_permissions_1.verifyGroupSignature)(group, oldGroup);
-        return super.save(group, opts);
-    }
-    async delete(groupId) {
-        const userContext = await (0, user_context_singleton_1.getUserContext)();
-        const userContextGroups = Groups(userContext.userDataContext);
-        if (userContextGroups === this) {
-            return super.delete(groupId);
+        async signAndSave(group, opts) {
+            if (!GroupsTable.addSignatureToGroup) {
+                throw new Error('Group signing must be enabled to sign and save groups. Call GroupsTable.enableGroupSigning(fn) to enable it.');
+            }
+            group = GroupsTable.addSignatureToGroup(group);
+            return this.save(group, opts);
         }
-        throw new Error('Only deleting groups from the user context Groups table is allowed');
-    }
-    /** @deprecated Direct inserts forbidden; use save() */
-    insert(..._args) {
-        throw new Error('Direct inserts forbidden; use save()');
-    }
-    /** @deprecated Direct updates forbidden; use save() */
-    update(..._args) {
-        throw new Error('Direct updates forbidden; use save()');
-    }
-}
+        async delete(groupId) {
+            const userContext = await (0, user_context_singleton_1.getUserContext)();
+            const userContextGroups = Groups(userContext.userDataContext);
+            if (userContextGroups === this) {
+                return super.delete(groupId);
+            }
+            throw new Error('Only deleting groups from the user context Groups table is allowed');
+        }
+        static addSignatureToGroup = undefined;
+        static enableGroupSigning(fn) {
+            this.addSignatureToGroup = fn;
+        }
+        /** @deprecated Direct inserts forbidden; use save() */
+        insert(..._args) {
+            throw new Error('Direct inserts forbidden; use save()');
+        }
+        /** @deprecated Direct updates forbidden; use save() */
+        update(..._args) {
+            throw new Error('Direct updates forbidden; use save()');
+        }
+        constructor() {
+            super(...arguments);
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+    };
+})();
 exports.GroupsTable = GroupsTable;
 (0, table_definitions_system_1.registerSystemTableDefinition)(metaData, exports.groupSchema, GroupsTable);
 function Groups(dataContext) {

package/dist/data/index.d.ts

@@ -27,6 +27,7 @@ export * from "./tool-tests";
 export * from "./tools";
 export * from "./users";
 export * from "./user-permissions";
+export * from "./user-trust-levels";
 export * from "./workflow-logs";
 export * from "./workflow-runs";
 export * from "./workflows";

package/dist/data/index.js

@@ -43,6 +43,7 @@ __exportStar(require("./tool-tests"), exports);
 __exportStar(require("./tools"), exports);
 __exportStar(require("./users"), exports);
 __exportStar(require("./user-permissions"), exports);
+__exportStar(require("./user-trust-levels"), exports);
 __exportStar(require("./workflow-logs"), exports);
 __exportStar(require("./workflow-runs"), exports);
 __exportStar(require("./workflows"), exports);

package/dist/data/knowledge/knowledge-frames.d.ts

@@ -23,7 +23,7 @@ declare const knowledgeFrameSchema: z.ZodObject<{
     conclusion?: string | undefined;
 }>;
 export type IKnowledgeFrame = z.infer<typeof knowledgeFrameSchema>;
-export declare function KnowledgeFrames(dataContext?: DataContext): import("../..").Table<{
+export declare function KnowledgeFrames(dataContext?: DataContext): import("../orm").Table<{
     name: string;
     body: string;
     knowledgeFrameId: string;

package/dist/data/knowledge/knowledge-links.d.ts

@@ -20,7 +20,7 @@ declare const knowledgeLinkSchema: z.ZodObject<{
     objectValueId?: string | undefined;
 }>;
 export type IKnowledgeLink = z.infer<typeof knowledgeLinkSchema>;
-export declare function KnowledgeLinks(dataContext?: DataContext): import("../..").Table<{
+export declare function KnowledgeLinks(dataContext?: DataContext): import("../orm").Table<{
     knowledgeLinkId: string;
     subjectValueId: string;
     predicateId: string;

package/dist/data/knowledge/knowledge-values.d.ts

@@ -24,7 +24,7 @@ export declare const knowledgeValueSchema: z.ZodObject<{
     lastModified?: Date | undefined;
 }>;
 export type IKnowledgeValue = z.infer<typeof knowledgeValueSchema>;
-export declare function KnowledgeValues(dataContext?: DataContext): import("../..").Table<{
+export declare function KnowledgeValues(dataContext?: DataContext): import("../orm").Table<{
     name: string;
     value: {} & {
         [k: string]: any;

package/dist/data/knowledge/peer-types.d.ts

@@ -91,7 +91,7 @@ declare const valueTypeSchema: z.ZodObject<{
     iconClass?: string | undefined;
 }>;
 export type IPeerType = z.infer<typeof valueTypeSchema>;
-export declare function PeerTypes(dataContext?: DataContext): import("../..").Table<{
+export declare function PeerTypes(dataContext?: DataContext): import("../orm").Table<{
     name: string;
     schema: {
         type: import("../tools").IOSchemaType;

package/dist/data/knowledge/predicates.d.ts

@@ -23,7 +23,7 @@ declare const predicateSchema: z.ZodObject<{
     allowedObjectValueTypes?: string[] | undefined;
 }>;
 export type IPredicate = z.infer<typeof predicateSchema>;
-export declare function Predicates(dataContext?: DataContext): import("../..").Table<{
+export declare function Predicates(dataContext?: DataContext): import("../orm").Table<{
     name: string;
     predicateId: string;
     description?: string | undefined;

package/dist/data/messages.d.ts

@@ -13,8 +13,8 @@ export declare const messageSchema: z.ZodObject<{
     vars: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodAny, z.objectOutputType<{}, z.ZodAny, "strip">, z.objectInputType<{}, z.ZodAny, "strip">>>;
 }, "strip", z.ZodTypeAny, {
     message: string;
-    userId: string;
     createdAt: Date;
+    userId: string;
     channelId: string;
     messageId: string;
     assistantId?: string | undefined;
@@ -24,8 +24,8 @@ export declare const messageSchema: z.ZodObject<{
     fileIds?: string[] | undefined;
 }, {
     message: string;
-    userId: string;
     createdAt: Date;
+    userId: string;
     channelId: string;
     messageId: string;
     assistantId?: string | undefined;
@@ -35,10 +35,10 @@ export declare const messageSchema: z.ZodObject<{
     fileIds?: string[] | undefined;
 }>;
 export type IMessage = z.infer<typeof messageSchema>;
-export declare function Messages(dataContext?: DataContext): import("..").Table<{
+export declare function Messages(dataContext?: DataContext): import("./orm").Table<{
     message: string;
-    userId: string;
     createdAt: Date;
+    userId: string;
     channelId: string;
     messageId: string;
     assistantId?: string | undefined;

package/dist/data/orm/client-proxy.data-source.js

@@ -23,43 +23,33 @@ class ClientProxyDataSource {
         }
     }
     async get(id, opts = {}) {
-        return rpc_types_1.rpcServerCalls.tableGet(this.dataContextId, this.tableName, id, opts);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'get', id, opts);
     }
     async list(filter = {}, opts = {}) {
-        return rpc_types_1.rpcServerCalls.tableList(this.dataContextId, this.tableName, filter, opts);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'list', filter, opts);
     }
     ;
     async count(filter = {}) {
-        return rpc_types_1.rpcServerCalls.tableCount(this.dataContextId, this.tableName, filter);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'count', filter);
     }
     ;
     cursor(filter = {}, opts = {}) {
         return (0, data_query_1.dataSourceCursor)(this, filter, opts);
     }
     async findOne(filter = {}, opts) {
-        if (!opts?.enforceUnique) {
-            const records = await this.list(filter, { pageSize: 1 });
-            return records[0];
-        }
-        else {
-            const records = await this.list(filter, { pageSize: 2 });
-            if (records.length > 1) {
-                throw new Error(`Matched more than one record for ${this.tableName} with query ${JSON.stringify(filter)}`);
-            }
-            return records[0];
-        }
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'findOne', filter, opts);
     }
     async save(record, opts) {
-        return rpc_types_1.rpcServerCalls.tableSave(this.dataContextId, this.tableName, record, opts);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'save', record, opts);
     }
     async insert(record) {
-        return rpc_types_1.rpcServerCalls.tableInsert(this.dataContextId, this.tableName, record);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'insert', record);
     }
     async update(record) {
-        return rpc_types_1.rpcServerCalls.tableUpdate(this.dataContextId, this.tableName, record);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'update', record);
     }
     async delete(idOrRecord) {
-        return rpc_types_1.rpcServerCalls.tableDelete(this.dataContextId, this.tableName, idOrRecord);
+        return rpc_types_1.rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, 'delete', idOrRecord);
     }
 }
 exports.ClientProxyDataSource = ClientProxyDataSource;

package/dist/data/orm/decorators.d.ts

@@ -3,4 +3,4 @@
  * When used on the client side, these methods will be automatically proxied
  * to the server via rpcServerCalls.tableMethodCall.
  */
-export declare function ProxyClientCalls(): (target: any, context: any) => any;
+export declare function ProxyClientTableMethodCalls(): (target: any, context: any) => any;

package/dist/data/orm/decorators.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyClientCalls = ProxyClientCalls;
+exports.ProxyClientTableMethodCalls = ProxyClientTableMethodCalls;
+const rpc_types_1 = require("../../rpc-types");
 /**
  * Decorator that marks a table method as server-side only.
  * When used on the client side, these methods will be automatically proxied
  * to the server via rpcServerCalls.tableMethodCall.
  */
-function ProxyClientCalls() {
+function ProxyClientTableMethodCalls() {
     return function (target, context) {
-        if (context.kind === 'method' && typeof window !== 'undefined') {
+        if (context.kind === 'method' && rpc_types_1.isClient) {
             const methodName = context.name;
+            // WARNING: Using typescript's magical `this` param
             return function (...args) {
-                // Lazy import to avoid circular dependencies
-                const { rpcServerCalls } = require("../..");
-                return rpcServerCalls.tableMethodCall(this.dataContextId, this.tableName, methodName, ...args);
+                const dataContextId = this.dataSource.dataContextId || this.groupId || '';
+                return rpc_types_1.rpcServerCalls.tableMethodCall(dataContextId, this.tableName, methodName, ...args);
             };
         }
         return target;

package/dist/data/packages.d.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import type { DataContext } from "../context/data-context";
-import { ISaveOptions, Table } from "./orm";
+import type { ISaveOptions } from "./orm/data-query";
+import { Table } from "./orm/table";
 declare const schema: z.ZodObject<{
     packageId: z.ZodString;
     name: z.ZodString;