jazz-tools 0.14.21 → 0.14.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +3 -3
- package/CHANGELOG.md +8 -0
- package/dist/implementation/zodSchema/schemaTypes/AccountSchema.d.ts +1 -1
- package/dist/implementation/zodSchema/schemaTypes/AccountSchema.d.ts.map +1 -1
- package/dist/implementation/zodSchema/zodCo.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/implementation/zodSchema/schemaTypes/AccountSchema.ts +3 -13
- package/src/tests/groupsAndAccounts.test.ts +24 -17
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
> jazz-tools@0.14.
|
|
2
|
+
> jazz-tools@0.14.22 build /home/runner/_work/jazz/jazz/packages/jazz-tools
|
|
3
3
|
> tsup && pnpm types
|
|
4
4
|
|
|
5
5
|
[34mCLI[39m Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
[32mESM[39m [1mdist/index.js.map [22m[32m18.38 KB[39m
|
|
16
16
|
[32mESM[39m [1mdist/testing.js.map [22m[32m12.57 KB[39m
|
|
17
17
|
[32mESM[39m [1mdist/chunk-DAOCWHIV.js.map [22m[32m311.39 KB[39m
|
|
18
|
-
[32mESM[39m ⚡️ Build success in
|
|
18
|
+
[32mESM[39m ⚡️ Build success in 69ms
|
|
19
19
|
|
|
20
|
-
> jazz-tools@0.14.
|
|
20
|
+
> jazz-tools@0.14.22 types /home/runner/_work/jazz/jazz/packages/jazz-tools
|
|
21
21
|
> tsc --outDir dist
|
|
22
22
|
|
package/CHANGELOG.md
CHANGED
|
@@ -38,7 +38,7 @@ export type AccountSchema<Shape extends {
|
|
|
38
38
|
};
|
|
39
39
|
}) => Promise<AccountInstance<Shape>>;
|
|
40
40
|
getMe: () => AccountInstanceCoValuesNullable<Shape>;
|
|
41
|
-
withMigration(migration: (account:
|
|
41
|
+
withMigration(migration: (account: Loaded<AccountSchema<Shape>>, creationProps?: {
|
|
42
42
|
name: string;
|
|
43
43
|
}) => void): AccountSchema<Shape>;
|
|
44
44
|
getCoSchema: () => typeof Account;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountSchema.d.ts","sourceRoot":"","sources":["../../../../src/implementation/zodSchema/schemaTypes/AccountSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"AccountSchema.d.ts","sourceRoot":"","sources":["../../../../src/implementation/zodSchema/schemaTypes/AccountSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zodCo.d.ts","sourceRoot":"","sources":["../../../src/implementation/zodSchema/zodCo.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,cAAc,EAEd,YAAY,EACZ,YAAY,EACZ,WAAW,EAEX,eAAe,EACf,cAAc,EAId,gBAAgB,EAChB,eAAe,EACf,eAAe,EAGhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AA8CrC,eAAO,MAAM,YAAY,GAAI,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,cAAc,SACvD,KAAK,KACX,WAAW,CAAC,KAAK,CAMnB,CAAC;AA8DF,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS;IACZ,OAAO,EAAE,cAAc,CAAC;QACtB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACtD,CAAC,CAAC;IACH,IAAI,EAAE,cAAc,CAAC;CACtB,UAEM,KAAK,KAQX,aAAa,CAAC,KAAK,CAMrB,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EACnC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,YAEf,CAAC,aACA,CAAC,KACX,cAAc,CAAC,CAAC,EAAE,CAAC,CAKrB,CAAC;AA4BF,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,WAC5C,CAAC,KACT,YAAY,CAAC,CAAC,CAMhB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"zodCo.d.ts","sourceRoot":"","sources":["../../../src/implementation/zodSchema/zodCo.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,cAAc,EAEd,YAAY,EACZ,YAAY,EACZ,WAAW,EAEX,eAAe,EACf,cAAc,EAId,gBAAgB,EAChB,eAAe,EACf,eAAe,EAGhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAC;AA8CrC,eAAO,MAAM,YAAY,GAAI,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,cAAc,SACvD,KAAK,KACX,WAAW,CAAC,KAAK,CAMnB,CAAC;AA8DF,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS;IACZ,OAAO,EAAE,cAAc,CAAC;QACtB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/C,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KACtD,CAAC,CAAC;IACH,IAAI,EAAE,cAAc,CAAC;CACtB,UAEM,KAAK,KAQX,aAAa,CAAC,KAAK,CAMrB,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EACnC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,YAEf,CAAC,aACA,CAAC,KACX,cAAc,CAAC,CAAC,EAAE,CAAC,CAKrB,CAAC;AA4BF,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,WAC5C,CAAC,KACT,YAAY,CAAC,CAAC,CAMhB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,cAAc;UAtIjC,EAAC,IAAI,CAAC,UAAU;WACZ,EAAI,IAAG,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,UAC7B;iBAAiB,EAAG,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,UAC5C;WAqIC,KAAK,GAAG;IACb,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;CACtD,KACA,eAAe,CAAC,KAAK,CAQvB,CAAC;AAiCF,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,WAC5C,CAAC,KACT,YAAY,CAAC,CAAC,CAEhB,CAAC;AAgCF,eAAO,MAAM,mBAAmB,QAAO,gBAEtC,CAAC;AA6BF,eAAO,MAAM,kBAAkB,QAAO,eAErC,CAAC;AA0BF,eAAO,MAAM,iBAAiB,QAAO,cAEpC,CAAC;AAEF,eAAO,MAAM,cAAc,QAAO,OAAO,eAExC,CAAC"}
|
package/package.json
CHANGED
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
},
|
|
18
18
|
"type": "module",
|
|
19
19
|
"license": "MIT",
|
|
20
|
-
"version": "0.14.
|
|
20
|
+
"version": "0.14.22",
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@scure/bip39": "^1.3.0",
|
|
23
23
|
"fast-myers-diff": "^3.2.0",
|
|
24
24
|
"zod": "3.25.28",
|
|
25
|
-
"cojson": "0.14.
|
|
25
|
+
"cojson": "0.14.22"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"tsup": "8.3.5",
|
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
import { CryptoProvider } from "cojson";
|
|
2
|
-
import {
|
|
3
|
-
Account,
|
|
4
|
-
Group,
|
|
5
|
-
RefsToResolveStrict,
|
|
6
|
-
Simplify,
|
|
7
|
-
} from "../../../internal.js";
|
|
2
|
+
import { Account, Group, RefsToResolveStrict } from "../../../internal.js";
|
|
8
3
|
import { AnonymousJazzAgent } from "../../anonymousJazzAgent.js";
|
|
9
4
|
import { InstanceOrPrimitiveOfSchema } from "../typeConverters/InstanceOrPrimitiveOfSchema.js";
|
|
10
5
|
import { InstanceOrPrimitiveOfSchemaCoValuesNullable } from "../typeConverters/InstanceOrPrimitiveOfSchemaCoValuesNullable.js";
|
|
11
6
|
import { z } from "../zodReExport.js";
|
|
12
7
|
import { Loaded, ResolveQuery } from "../zodSchema.js";
|
|
13
|
-
import {
|
|
14
|
-
AnyCoMapSchema,
|
|
15
|
-
CoMapInitZod,
|
|
16
|
-
CoMapInstance,
|
|
17
|
-
CoMapSchema,
|
|
18
|
-
} from "./CoMapSchema.js";
|
|
8
|
+
import { AnyCoMapSchema, CoMapSchema } from "./CoMapSchema.js";
|
|
19
9
|
|
|
20
10
|
export type AccountSchema<
|
|
21
11
|
Shape extends {
|
|
@@ -60,7 +50,7 @@ export type AccountSchema<
|
|
|
60
50
|
|
|
61
51
|
withMigration(
|
|
62
52
|
migration: (
|
|
63
|
-
account:
|
|
53
|
+
account: Loaded<AccountSchema<Shape>>,
|
|
64
54
|
creationProps?: { name: string },
|
|
65
55
|
) => void,
|
|
66
56
|
): AccountSchema<Shape>;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { WasmCrypto } from "cojson/crypto/WasmCrypto";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
assert,
|
|
4
|
+
beforeEach,
|
|
5
|
+
describe,
|
|
6
|
+
expect,
|
|
7
|
+
expectTypeOf,
|
|
8
|
+
test,
|
|
9
|
+
} from "vitest";
|
|
3
10
|
import { Account, CoMap, Group, Profile, coField, z } from "../exports.js";
|
|
4
11
|
import { Loaded, Ref, co, zodSchemaToCoSchema } from "../internal.js";
|
|
5
12
|
import { createJazzTestAccount, setupJazzTestSync } from "../testing.js";
|
|
@@ -27,22 +34,22 @@ describe("Custom accounts and groups", async () => {
|
|
|
27
34
|
profile: CustomProfile,
|
|
28
35
|
root: co.map({}),
|
|
29
36
|
})
|
|
30
|
-
.withMigration(
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
);
|
|
37
|
+
.withMigration((account, creationProps?: { name: string }) => {
|
|
38
|
+
// making sure that the inferred type of account.root & account.profile considers the root/profile not being loaded
|
|
39
|
+
type R = typeof account.root;
|
|
40
|
+
const _r: R = {} as Loaded<typeof CustomAccount.def.shape.root> | null;
|
|
41
|
+
type P = typeof account.profile;
|
|
42
|
+
const _p: P = {} as Loaded<typeof CustomProfile> | null;
|
|
43
|
+
if (creationProps) {
|
|
44
|
+
console.log("In migration!");
|
|
45
|
+
const profileGroup = Group.create({ owner: account });
|
|
46
|
+
profileGroup.addMember("everyone", "reader");
|
|
47
|
+
account.profile = CustomProfile.create(
|
|
48
|
+
{ name: creationProps.name, color: "blue" },
|
|
49
|
+
profileGroup,
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
46
53
|
|
|
47
54
|
const me = await createJazzTestAccount({
|
|
48
55
|
creationProps: { name: "Hermes Puggington" },
|