jazz-tools 0.7.0-alpha.29 → 0.7.0-alpha.30
Sign up to get free protection for your applications and to get access to all the features.
- package/.turbo/turbo-build.log +11 -11
- package/CHANGELOG.md +6 -0
- package/dist/coValues/group.js +1 -0
- package/dist/coValues/group.js.map +1 -1
- package/dist/coValues/interfaces.js +17 -2
- package/dist/coValues/interfaces.js.map +1 -1
- package/dist/tests/groupsAndAccounts.test.js +16 -0
- package/dist/tests/groupsAndAccounts.test.js.map +1 -1
- package/package.json +1 -1
- package/src/coValues/group.ts +1 -0
- package/src/coValues/interfaces.ts +20 -1
- package/src/tests/groupsAndAccounts.test.ts +19 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
|
|
2
|
-
> jazz-tools@0.7.0-alpha.
|
|
2
|
+
> jazz-tools@0.7.0-alpha.29 build /Users/anselm/jazz/jazz/packages/jazz-tools
|
|
3
3
|
> npm run lint && rm -rf ./dist && tsc --sourceMap --outDir dist
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> jazz-tools@0.7.0-alpha.
|
|
6
|
+
> jazz-tools@0.7.0-alpha.29 lint
|
|
7
7
|
> eslint src/**/*.ts
|
|
8
8
|
|
|
9
9
|
|
|
@@ -56,15 +56,15 @@
|
|
|
56
56
|
105:23 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
57
57
|
|
|
58
58
|
/Users/anselm/jazz/jazz/packages/jazz-tools/src/coValues/interfaces.ts
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
59
|
+
16:19 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
60
|
+
19:71 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
61
|
+
58:62 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
62
|
+
74:15 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
63
|
+
76:18 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
64
|
+
79:34 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
65
|
+
82:39 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
66
|
+
115:27 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
67
|
+
217:24 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
|
68
68
|
|
|
69
69
|
/Users/anselm/jazz/jazz/packages/jazz-tools/src/implementation/schema.ts
|
|
70
70
|
27:61 warning Unexpected any. Specify a different type @typescript-eslint/no-explicit-any
|
package/CHANGELOG.md
CHANGED
package/dist/coValues/group.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/coValues/group.ts"],"names":[],"mappings":";AAQA,OAAO,EACH,OAAO,EACP,KAAK,EACL,WAAW,EACX,GAAG,EACH,EAAE,EACF,mBAAmB,EACnB,2BAA2B,EAC3B,UAAU,GACb,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,OAAQ,SAAQ,KAA2B;IAAxD;;QACI,SAAI,GAAG,EAAE,CAAC,MAAM,CAAC;IACrB,CAAC;CAAA;AAYD,MAAM,OAAO,KAWT,SAAQ,WAAW;IAWnB,IAAI,OAAO;QACP,OAAQ,IAAI,CAAC,WAA4B,CAAC,OAAO,CAAC;IACtD,CAAC;IAgBD,IAAI,KAAK;QAIL,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAE1B,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAEpB,CAAC;QAChB,OAAO;YACH,OAAO,EACH,SAAS;gBACR,IAAI,GAAG,CACJ,SAAS,EACT,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,OAAO,CAAC,OAEZ,CACI;YACb,IAAI,EACA,MAAM;gBACL,IAAI,GAAG,CACJ,MAAM,EACN,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,OAAO,CAAC,IAA4C,CACpD;SAChB,CAAC;IACN,CAAC;IAKD,YACI,IAA4C,EAC5C,OAA4D;QAE5D,KAAK,EAAE,CAAC;QACR,IAAI,GAAa,CAAC;QAElB,IAAI,OAAO,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;YAClC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;QAC1B,CAAC;aAAM,CAAC;YACJ,MAAM,SAAS,GAAG,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,CAAC;YAChD,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACrD,IACI,SAAS,YAAY,OAAO;gBAC5B,mBAAmB,CAAC,SAAS,CAAC,EAChC,CAAC;gBACC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC;gBAChC,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CACX,kDAAkD,CACrD,CAAC;YACN,CAAC;QACL,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAC1B,EAAE,EAAE;gBACA,KAAK,EAAE,GAAG,CAAC,EAAE;gBACb,UAAU,EAAE,KAAK;aACpB;YACD,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE;SAC1C,CAAC,CAAC;QAEH,OAAO,IAAI,KAAK,CACZ,IAAI,EACJ,2BAAiD,CACpD,CAAC;IACN,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAA0B,EAAE,IAAU;QAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../src/coValues/group.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect, Sink, Stream } from "effect";
|
|
2
2
|
import { RawAccount } from "cojson";
|
|
3
|
-
import { Account, AccountCtx, Group, SubscriptionScope, Ref, inspect, } from "../internal.js";
|
|
3
|
+
import { Account, AccountCtx, Group, SubscriptionScope, Ref, inspect, subscriptionsScopes, } from "../internal.js";
|
|
4
4
|
export function isCoValue(value) {
|
|
5
5
|
return value && value._type !== undefined;
|
|
6
6
|
}
|
|
@@ -9,10 +9,17 @@ export function isCoValueClass(value) {
|
|
|
9
9
|
}
|
|
10
10
|
export class CoValueBase {
|
|
11
11
|
get _owner() {
|
|
12
|
-
|
|
12
|
+
const owner = this._raw.group instanceof RawAccount
|
|
13
13
|
? Account.fromRaw(this._raw.group)
|
|
14
14
|
: Group.fromRaw(this._raw.group);
|
|
15
|
+
const subScope = subscriptionsScopes.get(this);
|
|
16
|
+
if (subScope) {
|
|
17
|
+
subScope.onRefAccessedOrSet(owner.id);
|
|
18
|
+
subscriptionsScopes.set(owner, subScope);
|
|
19
|
+
}
|
|
20
|
+
return owner;
|
|
15
21
|
}
|
|
22
|
+
/** @private */
|
|
16
23
|
get _loadedAs() {
|
|
17
24
|
return Account.fromNode(this._raw.core.node);
|
|
18
25
|
}
|
|
@@ -57,5 +64,13 @@ export class CoValueBase {
|
|
|
57
64
|
[inspect]() {
|
|
58
65
|
return this.toJSON();
|
|
59
66
|
}
|
|
67
|
+
as(otherSchema) {
|
|
68
|
+
const cast = otherSchema.fromRaw(this._raw);
|
|
69
|
+
const subScope = subscriptionsScopes.get(this);
|
|
70
|
+
if (subScope) {
|
|
71
|
+
subscriptionsScopes.set(cast, subScope);
|
|
72
|
+
}
|
|
73
|
+
return cast;
|
|
74
|
+
}
|
|
60
75
|
}
|
|
61
76
|
//# sourceMappingURL=interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/coValues/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EACH,OAAO,EACP,UAAU,EACV,KAAK,EACL,iBAAiB,EACjB,GAAG,EACH,OAAO,
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/coValues/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,9 @@ describe("Custom accounts and groups", async () => {
|
|
|
38
38
|
this.root = co.null;
|
|
39
39
|
this[_a] = co.ref(CustomAccount);
|
|
40
40
|
}
|
|
41
|
+
get nMembers() {
|
|
42
|
+
return this.members.length;
|
|
43
|
+
}
|
|
41
44
|
}
|
|
42
45
|
_a = co.members;
|
|
43
46
|
test("Custom account and group", async () => {
|
|
@@ -53,6 +56,7 @@ describe("Custom accounts and groups", async () => {
|
|
|
53
56
|
{ id: me.id, role: "admin" },
|
|
54
57
|
{ id: "everyone", role: "reader" },
|
|
55
58
|
]);
|
|
59
|
+
expect(group.nMembers).toBe(2);
|
|
56
60
|
await new Promise((resolve) => {
|
|
57
61
|
group.subscribe((update) => {
|
|
58
62
|
const meAsMember = update.members.find((member) => {
|
|
@@ -65,6 +69,18 @@ describe("Custom accounts and groups", async () => {
|
|
|
65
69
|
}
|
|
66
70
|
});
|
|
67
71
|
});
|
|
72
|
+
class MyMap extends CoMap {
|
|
73
|
+
constructor() {
|
|
74
|
+
super(...arguments);
|
|
75
|
+
this.name = co.string;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
const map = new MyMap({ name: "test" }, { owner: group });
|
|
79
|
+
const meAsCastMember = map._owner.as(CustomGroup).members.find((member) => member.id === me.id);
|
|
80
|
+
expect(meAsCastMember?.account?.profile?.name).toBe("Hermes Puggington");
|
|
81
|
+
expect(meAsCastMember?.account?.profile?.color).toBe("blue");
|
|
82
|
+
expect(map._owner.nMembers).toBeUndefined();
|
|
83
|
+
expect(map._owner.as(CustomGroup).nMembers).toBe(2);
|
|
68
84
|
});
|
|
69
85
|
});
|
|
70
86
|
//# sourceMappingURL=groupsAndAccounts.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupsAndAccounts.test.js","sourceRoot":"","sources":["../../src/tests/groupsAndAccounts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAE1D,IAAI,CAAC,CAAC,QAAQ,IAAI,UAAU,CAAC,EAAE,CAAC;IAC5B,8DAA8D;IAC7D,UAAkB,CAAC,MAAM,GAAG,SAAS,CAAC;AAC3C,CAAC;AAED,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,SAAS,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;;IAC9C,MAAM,aAAc,SAAQ,KAAoB;QAAhD;;YACI,SAAI,GAAG,EAAE,CAAC,MAAM,CAAC;YACjB,UAAK,GAAG,EAAE,CAAC,MAAM,CAAC;QACtB,CAAC;KAAA;IAED,MAAM,aAAc,SAAQ,OAAsB;QAAlD;;YACI,YAAO,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAChC,SAAI,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAYzB,CAAC;QAVG,OAAO,CAAC,aAAgC;YACpC,IAAI,aAAa,EAAE,CAAC;gBAChB,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAC5B,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAC3C,EAAE,KAAK,EAAE,IAAI,EAAE,CAClB,CAAC;YACN,CAAC;QACL,CAAC;KACJ;IAED,MAAM,WAAY,SAAQ,KAAkB;QAA5C;;YACI,YAAO,GAAG,EAAE,CAAC,IAAI,CAAC;YAClB,SAAI,GAAG,EAAE,CAAC,IAAI,CAAC;YACf,QAAY,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"groupsAndAccounts.test.js","sourceRoot":"","sources":["../../src/tests/groupsAndAccounts.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/coValues/group.ts
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
SubscriptionScope,
|
|
10
10
|
Ref,
|
|
11
11
|
inspect,
|
|
12
|
+
subscriptionsScopes,
|
|
12
13
|
} from "../internal.js";
|
|
13
14
|
|
|
14
15
|
export type SubclassedConstructor<T> = {
|
|
@@ -93,11 +94,20 @@ export class CoValueBase implements CoValue {
|
|
|
93
94
|
_raw!: RawCoValue;
|
|
94
95
|
|
|
95
96
|
get _owner(): Account | Group {
|
|
96
|
-
|
|
97
|
+
const owner = this._raw.group instanceof RawAccount
|
|
97
98
|
? Account.fromRaw(this._raw.group)
|
|
98
99
|
: Group.fromRaw(this._raw.group);
|
|
100
|
+
|
|
101
|
+
const subScope = subscriptionsScopes.get(this);
|
|
102
|
+
if (subScope) {
|
|
103
|
+
subScope.onRefAccessedOrSet(owner.id);
|
|
104
|
+
subscriptionsScopes.set(owner, subScope);
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
return owner;
|
|
99
108
|
}
|
|
100
109
|
|
|
110
|
+
/** @private */
|
|
101
111
|
get _loadedAs() {
|
|
102
112
|
return Account.fromNode(this._raw.core.node);
|
|
103
113
|
}
|
|
@@ -215,4 +225,13 @@ export class CoValueBase implements CoValue {
|
|
|
215
225
|
[inspect]() {
|
|
216
226
|
return this.toJSON();
|
|
217
227
|
}
|
|
228
|
+
|
|
229
|
+
as<C extends CoValueClass>(otherSchema: C): InstanceType<C> {
|
|
230
|
+
const cast = otherSchema.fromRaw(this._raw) as InstanceType<C>;
|
|
231
|
+
const subScope = subscriptionsScopes.get(this);
|
|
232
|
+
if (subScope) {
|
|
233
|
+
subscriptionsScopes.set(cast, subScope);
|
|
234
|
+
}
|
|
235
|
+
return cast;
|
|
236
|
+
}
|
|
218
237
|
}
|
|
@@ -38,6 +38,10 @@ describe("Custom accounts and groups", async () => {
|
|
|
38
38
|
profile = co.null;
|
|
39
39
|
root = co.null;
|
|
40
40
|
[co.members] = co.ref(CustomAccount);
|
|
41
|
+
|
|
42
|
+
get nMembers() {
|
|
43
|
+
return this.members.length;
|
|
44
|
+
}
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
type T = CustomGroup[typeof co.members];
|
|
@@ -59,6 +63,8 @@ describe("Custom accounts and groups", async () => {
|
|
|
59
63
|
{ id: "everyone", role: "reader" },
|
|
60
64
|
]);
|
|
61
65
|
|
|
66
|
+
expect(group.nMembers).toBe(2);
|
|
67
|
+
|
|
62
68
|
await new Promise<void>((resolve) => {
|
|
63
69
|
group.subscribe((update) => {
|
|
64
70
|
const meAsMember = update.members.find((member) => {
|
|
@@ -73,5 +79,18 @@ describe("Custom accounts and groups", async () => {
|
|
|
73
79
|
}
|
|
74
80
|
});
|
|
75
81
|
});
|
|
82
|
+
|
|
83
|
+
class MyMap extends CoMap<MyMap> {
|
|
84
|
+
name = co.string;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
const map = new MyMap({name: "test"}, {owner: group});
|
|
88
|
+
|
|
89
|
+
const meAsCastMember = map._owner.as(CustomGroup).members.find((member) => member.id === me.id);
|
|
90
|
+
expect(meAsCastMember?.account?.profile?.name).toBe("Hermes Puggington");
|
|
91
|
+
expect(meAsCastMember?.account?.profile?.color).toBe("blue");
|
|
92
|
+
|
|
93
|
+
expect((map._owner as any).nMembers).toBeUndefined();
|
|
94
|
+
expect(map._owner.as(CustomGroup).nMembers).toBe(2);
|
|
76
95
|
});
|
|
77
96
|
});
|