jazz-tools 0.8.17 → 0.8.19-group-inheritance.0

package/.turbo/turbo-build.log

@@ -0,0 +1,12 @@
+
+> jazz-tools@0.8.18 build /Users/anselm/jazz/jazz/packages/jazz-tools
+> rm -rf ./dist && pnpm run build:web && pnpm run build:native
+
+
+> jazz-tools@0.8.18 build:web /Users/anselm/jazz/jazz/packages/jazz-tools
+> tsc --sourceMap --outDir dist/web -p tsconfig.web.json
+
+
+> jazz-tools@0.8.18 build:native /Users/anselm/jazz/jazz/packages/jazz-tools
+> tsc --sourceMap --outDir dist/native -p tsconfig.native.json
+

package/.turbo/turbo-lint.log

@@ -0,0 +1,4 @@
+
+> jazz-tools@0.7.35-guest-auth.5 lint /Users/anselm/jazz/jazz/packages/jazz-tools
+> eslint . --ext ts,tsx
+

package/.turbo/turbo-test.log

@@ -0,0 +1,144 @@
+
+> jazz-tools@0.7.35-unique.2 test /Users/anselm/jazz/jazz/packages/jazz-tools
+> vitest --run
+
+
+ RUN  v0.34.6 /Users/anselm/jazz/jazz/packages/jazz-tools
+
+ ✓ src/tests/groupsAndAccounts.test.ts  (1 test) 64ms
+stdout | unknown test
+TestMap schema undefined
+
+ ✓ src/tests/deepLoading.test.ts  (3 tests) 83ms
+stdout | src/tests/coList.test.ts > Simple CoList operations > Mutation > splice
+[ 'bread', 'onion' ] 0
+[ 'bread', 'salt', 'onion' ] 1
+
+stdout | src/tests/coList.test.ts > CoList resolution > Subscription & auto-resolution
+subscribedList?.[0]?.[0]?.[0] undefined
+subscribedList?.[0]?.[0]?.[0] undefined
+subscribedList?.[0]?.[0]?.[0] a
+subscribedList?.[0]?.[0]?.[0] x
+subscribedList?.[0]?.[0]?.[0] y
+subscribedList?.[0]?.[0]?.[0] w
+
+ ✓ src/tests/coList.test.ts  (10 tests) 190ms
+stdout | src/tests/coStream.test.ts > CoStream resolution > Subscription & auto-resolution
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.414Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value undefined
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value undefined
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.414Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value null
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value undefined
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.414Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value {
+  id: 'co_zHELVqRmAN6YuGDpKqVrSXJ5qe1',
+  _type: 'CoStream',
+  perSession: undefined,
+  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'milk',
+  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF: 'milk' }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value milk
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.414Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value {
+  id: 'co_zHELVqRmAN6YuGDpKqVrSXJ5qe1',
+  _type: 'CoStream',
+  perSession: undefined,
+  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'bread',
+  in: {
+    co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_ziAMdGVstAxF: 'milk',
+    co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'bread'
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value bread
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.424Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value {
+  id: 'co_zJmdvJY15XJkWF3n3rwPgGfebxa',
+  _type: 'CoStream',
+  perSession: undefined,
+  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'butter',
+  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'butter' }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value butter
+subscribedStream[me.id] {
+  value: [Getter],
+  ref: [Getter],
+  by: [Getter],
+  madeAt: 2024-09-05T17:35:38.424Z,
+  tx: {
+    sessionID: 'co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa',
+    txIndex: 0
+  }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value {
+  id: 'co_zJmdvJY15XJkWF3n3rwPgGfebxa',
+  _type: 'CoStream',
+  perSession: undefined,
+  co_zURWEpvoH1e35FGHVxadgXKU8Ri: 'jam',
+  in: { co_zURWEpvoH1e35FGHVxadgXKU8Ri_session_zgik2JjD86Qa: 'jam' }
+}
+subscribedStream[me.id]?.value?.[me.id]?.value?.[me.id]?.value jam
+
+ ✓ src/tests/coStream.test.ts  (10 tests) 205ms
+stdout | src/tests/coMap.test.ts > CoMap resolution > Subscription & auto-resolution
+subscribedMap.nested?.twiceNested?.taste undefined
+subscribedMap.nested?.twiceNested?.taste undefined
+subscribedMap.nested?.twiceNested?.taste sour
+subscribedMap.nested?.twiceNested?.taste sour
+subscribedMap.nested?.twiceNested?.taste sweet
+subscribedMap.nested?.twiceNested?.taste sweet
+subscribedMap.nested?.twiceNested?.taste salty
+subscribedMap.nested?.twiceNested?.taste umami
+
+ ✓ src/tests/coMap.test.ts  (20 tests) 257ms
+
+ Test Files  5 passed (5)
+      Tests  44 passed (44)
+   Start at  18:35:37
+   Duration  929ms (transform 419ms, setup 0ms, collect 2.29s, tests 799ms, environment 0ms, prepare 298ms)
+

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # jazz-tools
 
+## 0.8.19-group-inheritance.0
+
+### Patch Changes
+
+- 8b87117: Implement Group Inheritance
+- Updated dependencies [8b87117]
+  - cojson@0.8.19-group-inheritance.0
+
+## 0.8.18
+
+### Patch Changes
+
+- Updated dependencies [d4319d8]
+  - cojson@0.8.18
+
 ## 0.8.17
 
 ### Patch Changes

package/dist/native/coValues/group.js

@@ -75,6 +75,10 @@ export class Group extends CoValueBase {
         this._raw.addMember(member === "everyone" ? member : member._raw, role);
         return this;
     }
+    removeMember(member) {
+        this._raw.removeMember(member === "everyone" ? member : member._raw);
+        return this;
+    }
     get members() {
         return this._raw
             .keys()
@@ -97,6 +101,10 @@ export class Group extends CoValueBase {
             };
         });
     }
+    extend(parent) {
+        this._raw.extend(parent._raw);
+        return this;
+    }
     /** @category Subscription & Loading */
     static load(id, as, depth) {
         return loadCoValue(this, id, as, depth);

package/dist/native/coValues/group.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/coValues/group.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/coValues/group.ts"],"names":[],"mappings":"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"}

package/dist/web/coValues/group.js

@@ -75,6 +75,10 @@ export class Group extends CoValueBase {
         this._raw.addMember(member === "everyone" ? member : member._raw, role);
         return this;
     }
+    removeMember(member) {
+        this._raw.removeMember(member === "everyone" ? member : member._raw);
+        return this;
+    }
     get members() {
         return this._raw
             .keys()
@@ -97,6 +101,10 @@ export class Group extends CoValueBase {
             };
         });
     }
+    extend(parent) {
+        this._raw.extend(parent._raw);
+        return this;
+    }
     /** @category Subscription & Loading */
     static load(id, as, depth) {
         return loadCoValue(this, id, as, depth);

package/dist/web/coValues/group.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/coValues/group.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/coValues/group.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -19,10 +19,10 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.8.17",
+  "version": "0.8.19-group-inheritance.0",
   "dependencies": {
     "fast-check": "^3.17.2",
-    "cojson": "0.8.17"
+    "cojson": "0.8.19-group-inheritance.0"
   },
   "devDependencies": {
     "typescript": "^5.3.3",

package/src/coValues/group.ts

@@ -142,6 +142,11 @@ export class Group extends CoValueBase implements CoValue {
     return this;
   }
 
+  removeMember(member: Everyone | Account) {
+    this._raw.removeMember(member === "everyone" ? member : member._raw);
+    return this;
+  }
+
   get members() {
     return this._raw
       .keys()
@@ -172,6 +177,11 @@ export class Group extends CoValueBase implements CoValue {
       });
   }
 
+  extend(parent: Group) {
+    this._raw.extend(parent._raw);
+    return this;
+  }
+
   /** @category Subscription & Loading */
   static load<G extends Group, Depth>(
     this: CoValueClass<G>,

package/src/tests/groupsAndAccounts.test.ts

@@ -1,3 +1,4 @@
+import { RawGroup } from "cojson";
 import { describe, expect, test } from "vitest";
 import { Account, CoMap, Group, WasmCrypto, co } from "../index.web.js";
 
@@ -85,3 +86,95 @@ describe("Custom accounts and groups", async () => {
     expect(map._owner.castAs(CustomGroup).nMembers).toBe(2);
   });
 });
+
+describe("Group inheritance", () => {
+  class TestMap extends CoMap {
+    title = co.string;
+  }
+
+  test("Group inheritance", async () => {
+    const me = await Account.create({
+      creationProps: { name: "Hermes Puggington" },
+      crypto: Crypto,
+    });
+
+    const parentGroup = Group.create({ owner: me });
+    const group = Group.create({ owner: me });
+
+    group.extend(parentGroup);
+
+    console.log(
+      group.id,
+      group._raw.core.getDependedOnCoValuesUncached(),
+      parentGroup.id,
+    );
+
+    console.log(
+      (group._raw.core.getCurrentContent() as RawGroup)
+        .keys()
+        .filter((k) => k.startsWith("parent_"))
+        .map((k) => k.replace("parent_", "")),
+    );
+
+    const reader = await Account.createAs(me, {
+      creationProps: { name: "Reader" },
+    });
+
+    parentGroup.addMember(reader, "reader");
+
+    const mapInChild = TestMap.create({ title: "In Child" }, { owner: group });
+
+    const mapAsReader = await TestMap.load(mapInChild.id, reader, {});
+    expect(mapAsReader?.title).toBe("In Child");
+
+    parentGroup.removeMember(reader);
+
+    mapInChild.title = "In Child (updated)";
+
+    const mapAsReaderAfterUpdate = await TestMap.load(
+      mapInChild.id,
+      reader,
+      {},
+    );
+    expect(mapAsReaderAfterUpdate?.title).toBe("In Child");
+  });
+
+  test("Group inheritance with grand-children", async () => {
+    const me = await Account.create({
+      creationProps: { name: "Hermes Puggington" },
+      crypto: Crypto,
+    });
+
+    const grandParentGroup = Group.create({ owner: me });
+    const parentGroup = Group.create({ owner: me });
+    const group = Group.create({ owner: me });
+
+    group.extend(parentGroup);
+    parentGroup.extend(grandParentGroup);
+
+    const reader = await Account.createAs(me, {
+      creationProps: { name: "Reader" },
+    });
+
+    grandParentGroup.addMember(reader, "reader");
+
+    const mapInGrandChild = TestMap.create(
+      { title: "In Grand Child" },
+      { owner: group },
+    );
+
+    const mapAsReader = await TestMap.load(mapInGrandChild.id, reader, {});
+    expect(mapAsReader?.title).toBe("In Grand Child");
+
+    grandParentGroup.removeMember(reader);
+
+    mapInGrandChild.title = "In Grand Child (updated)";
+
+    const mapAsReaderAfterUpdate = await TestMap.load(
+      mapInGrandChild.id,
+      reader,
+      {},
+    );
+    expect(mapAsReaderAfterUpdate?.title).toBe("In Grand Child");
+  });
+});