jazz-tools 0.7.34 → 0.7.35-new-auth.0
Sign up to get free protection for your applications and to get access to all the features.
- package/.turbo/turbo-build.log +2 -2
- package/.turbo/turbo-test.log +0 -142
- package/CHANGELOG.md +6 -0
- package/dist/coValues/account.js +20 -35
- package/dist/coValues/account.js.map +1 -1
- package/dist/coValues/coList.js +14 -19
- package/dist/coValues/coList.js.map +1 -1
- package/dist/coValues/coMap.js +10 -16
- package/dist/coValues/coMap.js.map +1 -1
- package/dist/coValues/coStream.js +14 -19
- package/dist/coValues/coStream.js.map +1 -1
- package/dist/coValues/extensions/imageDef.js +3 -8
- package/dist/coValues/extensions/imageDef.js.map +1 -1
- package/dist/coValues/group.js +20 -23
- package/dist/coValues/group.js.map +1 -1
- package/dist/implementation/createContext.js +94 -0
- package/dist/implementation/createContext.js.map +1 -0
- package/dist/implementation/refs.js +3 -0
- package/dist/implementation/refs.js.map +1 -1
- package/dist/implementation/subscriptionScope.js +8 -5
- package/dist/implementation/subscriptionScope.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/internal.js +1 -0
- package/dist/internal.js.map +1 -1
- package/dist/tests/coList.test.js +23 -15
- package/dist/tests/coList.test.js.map +1 -1
- package/dist/tests/coMap.test.js +52 -97
- package/dist/tests/coMap.test.js.map +1 -1
- package/dist/tests/coStream.test.js +26 -22
- package/dist/tests/coStream.test.js.map +1 -1
- package/dist/tests/deepLoading.test.js +24 -36
- package/dist/tests/deepLoading.test.js.map +1 -1
- package/dist/tests/groupsAndAccounts.test.js +8 -22
- package/dist/tests/groupsAndAccounts.test.js.map +1 -1
- package/package.json +1 -1
- package/src/coValues/account.ts +5 -28
- package/src/coValues/coList.ts +4 -4
- package/src/coValues/coStream.ts +4 -4
- package/src/coValues/group.ts +2 -2
- package/src/coValues/interfaces.ts +4 -4
- package/src/implementation/createContext.ts +162 -0
- package/src/index.ts +8 -1
- package/src/internal.ts +2 -0
- package/src/tests/coList.test.ts +30 -14
- package/src/tests/coMap.test.ts +72 -68
- package/src/tests/coStream.test.ts +27 -21
- package/src/tests/deepLoading.test.ts +18 -13
- package/tsconfig.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deepLoading.test.js","sourceRoot":"","sources":["../../src/tests/deepLoading.test.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EACH,OAAO,EACP,MAAM,EACN,KAAK,EACL,QAAQ,EAER,UAAU,EACV,EAAE,EACF,OAAO,EACP,mBAAmB,
|
1
|
+
{"version":3,"file":"deepLoading.test.js","sourceRoot":"","sources":["../../src/tests/deepLoading.test.ts"],"names":[],"mappings":"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"}
|
@@ -2,20 +2,13 @@ import { expect, describe, test } from "vitest";
|
|
2
2
|
import { Account, CoMap, co, Group, WasmCrypto } from "../index.js";
|
3
3
|
const Crypto = await WasmCrypto.create();
|
4
4
|
describe("Custom accounts and groups", async () => {
|
5
|
-
var _a;
|
6
5
|
class CustomProfile extends CoMap {
|
7
|
-
|
8
|
-
|
9
|
-
this.name = co.string;
|
10
|
-
this.color = co.string;
|
11
|
-
}
|
6
|
+
name = co.string;
|
7
|
+
color = co.string;
|
12
8
|
}
|
13
9
|
class CustomAccount extends Account {
|
14
|
-
|
15
|
-
|
16
|
-
this.profile = co.ref(CustomProfile);
|
17
|
-
this.root = co.ref(CoMap);
|
18
|
-
}
|
10
|
+
profile = co.ref(CustomProfile);
|
11
|
+
root = co.ref(CoMap);
|
19
12
|
migrate(creationProps) {
|
20
13
|
if (creationProps) {
|
21
14
|
const profileGroup = Group.create({ owner: this });
|
@@ -25,17 +18,13 @@ describe("Custom accounts and groups", async () => {
|
|
25
18
|
}
|
26
19
|
}
|
27
20
|
class CustomGroup extends Group {
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
this.root = co.null;
|
32
|
-
this[_a] = co.ref(CustomAccount);
|
33
|
-
}
|
21
|
+
profile = co.null;
|
22
|
+
root = co.null;
|
23
|
+
[co.members] = co.ref(CustomAccount);
|
34
24
|
get nMembers() {
|
35
25
|
return this.members.length;
|
36
26
|
}
|
37
27
|
}
|
38
|
-
_a = co.members;
|
39
28
|
test("Custom account and group", async () => {
|
40
29
|
const me = await CustomAccount.create({
|
41
30
|
creationProps: { name: "Hermes Puggington" },
|
@@ -64,10 +53,7 @@ describe("Custom accounts and groups", async () => {
|
|
64
53
|
});
|
65
54
|
});
|
66
55
|
class MyMap extends CoMap {
|
67
|
-
|
68
|
-
super(...arguments);
|
69
|
-
this.name = co.string;
|
70
|
-
}
|
56
|
+
name = co.string;
|
71
57
|
}
|
72
58
|
const map = MyMap.create({ name: "test" }, { owner: group });
|
73
59
|
const meAsCastMember = map._owner
|
@@ -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,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEpE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;AAEzC,QAAQ,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE
|
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/account.ts
CHANGED
@@ -161,6 +161,7 @@ export class Account extends CoValueBase implements CoValue {
|
|
161
161
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
162
162
|
}
|
163
163
|
|
164
|
+
/** @private */
|
164
165
|
static async create<A extends Account>(
|
165
166
|
this: CoValueClass<A> & typeof Account,
|
166
167
|
options: {
|
@@ -184,34 +185,6 @@ export class Account extends CoValueBase implements CoValue {
|
|
184
185
|
return this.fromNode(node) as A;
|
185
186
|
}
|
186
187
|
|
187
|
-
static async become<A extends Account>(
|
188
|
-
this: CoValueClass<A> & typeof Account,
|
189
|
-
options: {
|
190
|
-
accountID: ID<Account>;
|
191
|
-
accountSecret: AgentSecret;
|
192
|
-
sessionID?: SessionID;
|
193
|
-
peersToLoadFrom: Peer[];
|
194
|
-
crypto: CryptoProvider;
|
195
|
-
},
|
196
|
-
): Promise<A> {
|
197
|
-
const node = await LocalNode.withLoadedAccount({
|
198
|
-
accountID: options.accountID as unknown as CoID<RawAccount>,
|
199
|
-
accountSecret: options.accountSecret,
|
200
|
-
sessionID: options.sessionID,
|
201
|
-
peersToLoadFrom: options.peersToLoadFrom,
|
202
|
-
crypto: options.crypto,
|
203
|
-
migration: async (rawAccount, _node, creationProps) => {
|
204
|
-
const account = new this({
|
205
|
-
fromRaw: rawAccount,
|
206
|
-
}) as A;
|
207
|
-
|
208
|
-
await account.migrate?.(creationProps);
|
209
|
-
},
|
210
|
-
});
|
211
|
-
|
212
|
-
return this.fromNode(node) as A;
|
213
|
-
}
|
214
|
-
|
215
188
|
static async createAs<A extends Account>(
|
216
189
|
this: CoValueClass<A> & typeof Account,
|
217
190
|
as: Account,
|
@@ -383,3 +356,7 @@ export function isControlledAccount(account: Account): account is Account & {
|
|
383
356
|
} {
|
384
357
|
return account.isMe;
|
385
358
|
}
|
359
|
+
|
360
|
+
export type AccountClass<Acc extends Account> = CoValueClass<Acc> & {
|
361
|
+
fromNode: (typeof Account)["fromNode"];
|
362
|
+
};
|
package/src/coValues/coList.ts
CHANGED
@@ -80,16 +80,16 @@ export class CoList<Item = any> extends Array<Item> implements CoValue {
|
|
80
80
|
/**
|
81
81
|
* The ID of this `CoList`
|
82
82
|
* @category Content */
|
83
|
-
id
|
83
|
+
declare id: ID<this>;
|
84
84
|
/** @category Type Helpers */
|
85
|
-
_type
|
85
|
+
declare _type: "CoList";
|
86
86
|
static {
|
87
87
|
this.prototype._type = "CoList";
|
88
88
|
}
|
89
89
|
/** @category Internals */
|
90
|
-
_raw
|
90
|
+
declare _raw: RawCoList;
|
91
91
|
/** @category Internals */
|
92
|
-
_instanceID
|
92
|
+
declare _instanceID: string;
|
93
93
|
|
94
94
|
/** @internal This is only a marker type and doesn't exist at runtime */
|
95
95
|
[ItemsSym]!: Item;
|
package/src/coValues/coStream.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import type {
|
2
|
-
|
2
|
+
RawAccountID,
|
3
3
|
AgentID,
|
4
4
|
BinaryStreamInfo,
|
5
5
|
CojsonInternalTypes,
|
@@ -228,7 +228,7 @@ export class CoStream<Item = any> extends CoValueBase implements CoValue {
|
|
228
228
|
function entryFromRawEntry<Item>(
|
229
229
|
accessFrom: CoValue,
|
230
230
|
rawEntry: {
|
231
|
-
by:
|
231
|
+
by: RawAccountID | AgentID;
|
232
232
|
tx: CojsonInternalTypes.TransactionID;
|
233
233
|
at: Date;
|
234
234
|
value: JsonValue;
|
@@ -301,7 +301,7 @@ function entryFromRawEntry<Item>(
|
|
301
301
|
export const CoStreamProxyHandler: ProxyHandler<CoStream> = {
|
302
302
|
get(target, key, receiver) {
|
303
303
|
if (typeof key === "string" && key.startsWith("co_")) {
|
304
|
-
const rawEntry = target._raw.lastItemBy(key as
|
304
|
+
const rawEntry = target._raw.lastItemBy(key as RawAccountID);
|
305
305
|
|
306
306
|
if (!rawEntry) return;
|
307
307
|
const entry = entryFromRawEntry(
|
@@ -314,7 +314,7 @@ export const CoStreamProxyHandler: ProxyHandler<CoStream> = {
|
|
314
314
|
|
315
315
|
Object.defineProperty(entry, "all", {
|
316
316
|
get: () => {
|
317
|
-
const allRawEntries = target._raw.itemsBy(key as
|
317
|
+
const allRawEntries = target._raw.itemsBy(key as RawAccountID);
|
318
318
|
return (function* () {
|
319
319
|
while (true) {
|
320
320
|
const rawEntry = allRawEntries.next();
|
package/src/coValues/group.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import type {
|
1
|
+
import type { RawAccountID, Everyone, RawGroup, Role } from "cojson";
|
2
2
|
import type {
|
3
3
|
CoValue,
|
4
4
|
ID,
|
@@ -158,7 +158,7 @@ export class Group extends CoValueBase implements CoValue {
|
|
158
158
|
return key === "everyone" || key.startsWith("co_");
|
159
159
|
})
|
160
160
|
.map((id) => {
|
161
|
-
const role = this._raw.get(id as Everyone |
|
161
|
+
const role = this._raw.get(id as Everyone | RawAccountID);
|
162
162
|
const accountID =
|
163
163
|
id === "everyone"
|
164
164
|
? undefined
|
@@ -63,11 +63,11 @@ type IDMarker<out T> = { __type(_: never): T };
|
|
63
63
|
|
64
64
|
/** @internal */
|
65
65
|
export class CoValueBase implements CoValue {
|
66
|
-
id
|
67
|
-
_type
|
68
|
-
_raw
|
66
|
+
declare id: ID<this>;
|
67
|
+
declare _type: string;
|
68
|
+
declare _raw: RawCoValue;
|
69
69
|
/** @category Internals */
|
70
|
-
_instanceID
|
70
|
+
declare _instanceID: string;
|
71
71
|
|
72
72
|
get _owner(): Account | Group {
|
73
73
|
const owner =
|
@@ -0,0 +1,162 @@
|
|
1
|
+
import {
|
2
|
+
AgentSecret,
|
3
|
+
CoID,
|
4
|
+
cojsonInternals,
|
5
|
+
CryptoProvider,
|
6
|
+
LocalNode,
|
7
|
+
Peer,
|
8
|
+
RawAccount,
|
9
|
+
RawAccountID,
|
10
|
+
SessionID,
|
11
|
+
} from "cojson";
|
12
|
+
import { Account, AccountClass, ID } from "../internal.js";
|
13
|
+
|
14
|
+
export type AuthResult =
|
15
|
+
| {
|
16
|
+
type: "existing";
|
17
|
+
credentials: { accountID: ID<Account>; secret: AgentSecret };
|
18
|
+
onSuccess: () => void;
|
19
|
+
onError: (error: string | Error) => void;
|
20
|
+
}
|
21
|
+
| {
|
22
|
+
type: "new";
|
23
|
+
creationProps: { name: string };
|
24
|
+
initialSecret?: AgentSecret;
|
25
|
+
saveCredentials: (credentials: {
|
26
|
+
accountID: ID<Account>;
|
27
|
+
secret: AgentSecret;
|
28
|
+
}) => Promise<void>;
|
29
|
+
onSuccess: () => void;
|
30
|
+
onError: (error: string | Error) => void;
|
31
|
+
};
|
32
|
+
|
33
|
+
export interface AuthMethod {
|
34
|
+
start(crypto: CryptoProvider): Promise<AuthResult>;
|
35
|
+
}
|
36
|
+
|
37
|
+
export const fixedCredentialsAuth = (credentials: {
|
38
|
+
accountID: ID<Account>;
|
39
|
+
secret: AgentSecret;
|
40
|
+
}): AuthMethod => {
|
41
|
+
return {
|
42
|
+
start: async () => ({
|
43
|
+
type: "existing",
|
44
|
+
credentials,
|
45
|
+
onSuccess: () => {},
|
46
|
+
onError: () => {},
|
47
|
+
}),
|
48
|
+
};
|
49
|
+
};
|
50
|
+
|
51
|
+
export async function randomSessionProvider(accountID: ID<Account>) {
|
52
|
+
return {
|
53
|
+
sessionID: cojsonInternals.newRandomSessionID(
|
54
|
+
accountID as unknown as RawAccountID,
|
55
|
+
),
|
56
|
+
sessionDone: () => {},
|
57
|
+
};
|
58
|
+
}
|
59
|
+
|
60
|
+
export async function createJazzContext<Acc extends Account>({
|
61
|
+
AccountSchema = Account as unknown as AccountClass<Acc>,
|
62
|
+
auth,
|
63
|
+
sessionProvider,
|
64
|
+
peersToLoadFrom,
|
65
|
+
crypto,
|
66
|
+
}: {
|
67
|
+
AccountSchema?: AccountClass<Acc>;
|
68
|
+
auth: AuthMethod;
|
69
|
+
sessionProvider: (
|
70
|
+
accountID: ID<Account>,
|
71
|
+
) => Promise<{ sessionID: SessionID; sessionDone: () => void }>;
|
72
|
+
peersToLoadFrom: Peer[];
|
73
|
+
crypto: CryptoProvider;
|
74
|
+
}): Promise<{ account: Acc; done: () => void }> {
|
75
|
+
// eslint-disable-next-line no-constant-condition
|
76
|
+
while (true) {
|
77
|
+
const authResult = await auth.start(crypto);
|
78
|
+
|
79
|
+
if (authResult.type === "existing") {
|
80
|
+
try {
|
81
|
+
const { sessionID, sessionDone } = await sessionProvider(
|
82
|
+
authResult.credentials.accountID,
|
83
|
+
);
|
84
|
+
|
85
|
+
try {
|
86
|
+
const node = await LocalNode.withLoadedAccount({
|
87
|
+
accountID: authResult.credentials
|
88
|
+
.accountID as unknown as CoID<RawAccount>,
|
89
|
+
accountSecret: authResult.credentials.secret,
|
90
|
+
sessionID: sessionID,
|
91
|
+
peersToLoadFrom: peersToLoadFrom,
|
92
|
+
crypto: crypto,
|
93
|
+
migration: async (rawAccount, _node, creationProps) => {
|
94
|
+
const account = new AccountSchema({
|
95
|
+
fromRaw: rawAccount,
|
96
|
+
}) as Acc;
|
97
|
+
|
98
|
+
await account.migrate?.(creationProps);
|
99
|
+
},
|
100
|
+
});
|
101
|
+
|
102
|
+
const account = AccountSchema.fromNode(node);
|
103
|
+
authResult.onSuccess();
|
104
|
+
|
105
|
+
return {
|
106
|
+
account,
|
107
|
+
done: () => {
|
108
|
+
node.gracefulShutdown();
|
109
|
+
sessionDone();
|
110
|
+
},
|
111
|
+
};
|
112
|
+
} catch (e) {
|
113
|
+
authResult.onError(
|
114
|
+
new Error("Error loading account", { cause: e }),
|
115
|
+
);
|
116
|
+
sessionDone();
|
117
|
+
}
|
118
|
+
} catch (e) {
|
119
|
+
authResult.onError(
|
120
|
+
new Error("Error acquiring sessionID", { cause: e }),
|
121
|
+
);
|
122
|
+
}
|
123
|
+
} else if (authResult.type === "new") {
|
124
|
+
try {
|
125
|
+
// TODO: figure out a way to not "waste" the first SessionID
|
126
|
+
const { node } = await LocalNode.withNewlyCreatedAccount({
|
127
|
+
creationProps: authResult.creationProps,
|
128
|
+
peersToLoadFrom: peersToLoadFrom,
|
129
|
+
crypto: crypto,
|
130
|
+
initialAgentSecret: authResult.initialSecret,
|
131
|
+
migration: async (rawAccount, _node, creationProps) => {
|
132
|
+
const account = new AccountSchema({
|
133
|
+
fromRaw: rawAccount,
|
134
|
+
}) as Acc;
|
135
|
+
|
136
|
+
await account.migrate?.(creationProps);
|
137
|
+
},
|
138
|
+
});
|
139
|
+
|
140
|
+
const account = AccountSchema.fromNode(node);
|
141
|
+
|
142
|
+
await authResult.saveCredentials({
|
143
|
+
accountID: node.account.id as unknown as ID<Account>,
|
144
|
+
secret: node.account.agentSecret,
|
145
|
+
});
|
146
|
+
|
147
|
+
authResult.onSuccess();
|
148
|
+
|
149
|
+
return {
|
150
|
+
account,
|
151
|
+
done: () => {
|
152
|
+
node.gracefulShutdown();
|
153
|
+
},
|
154
|
+
};
|
155
|
+
} catch (e) {
|
156
|
+
authResult.onError(
|
157
|
+
new Error("Error creating account", { cause: e }),
|
158
|
+
);
|
159
|
+
}
|
160
|
+
}
|
161
|
+
}
|
162
|
+
}
|
package/src/index.ts
CHANGED
@@ -21,9 +21,16 @@ export { CoMap, type CoMapInit } from "./internal.js";
|
|
21
21
|
export { CoList } from "./internal.js";
|
22
22
|
export { CoStream, BinaryCoStream } from "./internal.js";
|
23
23
|
export { Group, Profile } from "./internal.js";
|
24
|
-
export { Account, isControlledAccount } from "./internal.js";
|
24
|
+
export { Account, isControlledAccount, type AccountClass } from "./internal.js";
|
25
25
|
export { ImageDefinition } from "./internal.js";
|
26
26
|
export { CoValueBase, type CoValueClass } from "./internal.js";
|
27
27
|
export type { DepthsIn, DeeplyLoaded } from "./internal.js";
|
28
28
|
|
29
29
|
export { loadCoValue, subscribeToCoValue } from "./internal.js";
|
30
|
+
|
31
|
+
export {
|
32
|
+
type AuthMethod,
|
33
|
+
type AuthResult,
|
34
|
+
createJazzContext,
|
35
|
+
fixedCredentialsAuth,
|
36
|
+
} from "./internal.js";
|
package/src/internal.ts
CHANGED
package/src/tests/coList.test.ts
CHANGED
@@ -1,14 +1,16 @@
|
|
1
1
|
import { expect, describe, test } from "vitest";
|
2
2
|
import { connectedPeers } from "cojson/src/streamUtils.js";
|
3
|
-
import { newRandomSessionID } from "cojson/src/coValueCore.js";
|
4
3
|
import {
|
5
4
|
Account,
|
6
5
|
CoList,
|
7
6
|
WasmCrypto,
|
8
7
|
co,
|
9
8
|
cojsonInternals,
|
9
|
+
createJazzContext,
|
10
10
|
isControlledAccount,
|
11
|
+
fixedCredentialsAuth,
|
11
12
|
} from "../index.js";
|
13
|
+
import { randomSessionProvider } from "../internal.js";
|
12
14
|
|
13
15
|
const Crypto = await WasmCrypto.create();
|
14
16
|
|
@@ -169,12 +171,13 @@ describe("CoList resolution", async () => {
|
|
169
171
|
throw "me is not a controlled account";
|
170
172
|
}
|
171
173
|
me._raw.core.node.syncManager.addPeer(secondPeer);
|
172
|
-
const meOnSecondPeer = await
|
173
|
-
|
174
|
-
|
174
|
+
const { account: meOnSecondPeer } = await createJazzContext({
|
175
|
+
auth: fixedCredentialsAuth({
|
176
|
+
accountID: me.id,
|
177
|
+
secret: me._raw.agentSecret,
|
178
|
+
}),
|
179
|
+
sessionProvider: randomSessionProvider,
|
175
180
|
peersToLoadFrom: [initialAsPeer],
|
176
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
177
|
-
sessionID: newRandomSessionID(me.id as any),
|
178
181
|
crypto: Crypto,
|
179
182
|
});
|
180
183
|
|
@@ -192,7 +195,11 @@ describe("CoList resolution", async () => {
|
|
192
195
|
expect(loadedList?.[0]).toBeDefined();
|
193
196
|
expect(loadedList?.[0]?.[0]).toBe(null);
|
194
197
|
expect(loadedList?.[0]?._refs[0]?.id).toEqual(list[0]![0]!.id);
|
195
|
-
|
198
|
+
// TODO: this should be ref equal
|
199
|
+
// expect(loadedList?._refs[0]?.value).toEqual(loadedNestedList);
|
200
|
+
expect(loadedList?._refs[0]?.value?.toJSON()).toEqual(
|
201
|
+
loadedNestedList?.toJSON(),
|
202
|
+
);
|
196
203
|
|
197
204
|
const loadedTwiceNestedList = await TwiceNestedList.load(
|
198
205
|
list[0]![0]!.id,
|
@@ -204,7 +211,11 @@ describe("CoList resolution", async () => {
|
|
204
211
|
expect(loadedList?.[0]?.[0]?.[0]).toBe("a");
|
205
212
|
expect(loadedList?.[0]?.[0]?.joined()).toBe("a,b");
|
206
213
|
expect(loadedList?.[0]?._refs[0]?.id).toEqual(list[0]?.[0]?.id);
|
207
|
-
|
214
|
+
// TODO: this should be ref equal
|
215
|
+
// expect(loadedList?.[0]?._refs[0]?.value).toEqual(loadedTwiceNestedList);
|
216
|
+
expect(loadedList?.[0]?._refs[0]?.value?.toJSON()).toEqual(
|
217
|
+
loadedTwiceNestedList?.toJSON(),
|
218
|
+
);
|
208
219
|
|
209
220
|
const otherNestedList = NestedList.create(
|
210
221
|
[TwiceNestedList.create(["e", "f"], { owner: meOnSecondPeer })],
|
@@ -212,7 +223,11 @@ describe("CoList resolution", async () => {
|
|
212
223
|
);
|
213
224
|
|
214
225
|
loadedList![0] = otherNestedList;
|
215
|
-
|
226
|
+
// TODO: this should be ref equal
|
227
|
+
// expect(loadedList?.[0]).toEqual(otherNestedList);
|
228
|
+
expect(loadedList?._refs[0]?.value?.toJSON()).toEqual(
|
229
|
+
otherNestedList.toJSON(),
|
230
|
+
);
|
216
231
|
expect(loadedList?._refs[0]?.id).toEqual(otherNestedList.id);
|
217
232
|
});
|
218
233
|
|
@@ -231,12 +246,13 @@ describe("CoList resolution", async () => {
|
|
231
246
|
throw "me is not a controlled account";
|
232
247
|
}
|
233
248
|
me._raw.core.node.syncManager.addPeer(secondPeer);
|
234
|
-
const meOnSecondPeer = await
|
235
|
-
|
236
|
-
|
249
|
+
const { account: meOnSecondPeer } = await createJazzContext({
|
250
|
+
auth: fixedCredentialsAuth({
|
251
|
+
accountID: me.id,
|
252
|
+
secret: me._raw.agentSecret,
|
253
|
+
}),
|
254
|
+
sessionProvider: randomSessionProvider,
|
237
255
|
peersToLoadFrom: [initialAsPeer],
|
238
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
239
|
-
sessionID: newRandomSessionID(me.id as any),
|
240
256
|
crypto: Crypto,
|
241
257
|
});
|
242
258
|
|