jazz-tools 0.15.16 → 0.16.1

package/dist/tools/implementation/zodSchema/zodSchema.d.ts

@@ -1,40 +1,31 @@
 import { LocalNode, RawAccount } from "cojson";
-import { Account, AccountClass, CoValueClass, CoValueFromRaw, InstanceOfSchema, RefsToResolve, RefsToResolveStrict, Resolved, Simplify } from "../../internal.js";
-import { AccountSchema, AnyAccountSchema, BaseAccountShape } from "./schemaTypes/AccountSchema.js";
-import { AnyDiscriminableCoSchema, CoDiscriminatedUnionSchema } from "./schemaTypes/CoDiscriminatedUnionSchema.js";
-import { AnyCoFeedSchema, CoFeedSchema } from "./schemaTypes/CoFeedSchema.js";
-import { AnyCoListSchema, CoListSchema } from "./schemaTypes/CoListSchema.js";
-import { AnyCoMapSchema, CoMapInitZod, CoMapSchema } from "./schemaTypes/CoMapSchema.js";
-import { AnyCoOptionalSchema } from "./schemaTypes/CoOptionalSchema.js";
-import { AnyCoRecordSchema, CoRecordSchema } from "./schemaTypes/CoRecordSchema.js";
-import { AnyFileStreamSchema, FileStreamSchema } from "./schemaTypes/FileStreamSchema.js";
-import { AnyPlainTextSchema, PlainTextSchema } from "./schemaTypes/PlainTextSchema.js";
-import { AnyRichTextSchema, RichTextSchema } from "./schemaTypes/RichTextSchema.js";
+import { Account, AccountClass, CoRecordSchema, CoValueClass, CoValueFromRaw, CoreCoRecordSchema, InstanceOfSchema, RefsToResolve, RefsToResolveStrict, Resolved, Simplify } from "../../internal.js";
+import { AccountSchema, BaseAccountShape, CoreAccountSchema } from "./schemaTypes/AccountSchema.js";
+import { CoDiscriminatedUnionSchema, CoreCoDiscriminatedUnionSchema } from "./schemaTypes/CoDiscriminatedUnionSchema.js";
+import { CoFeedSchema, CoreCoFeedSchema } from "./schemaTypes/CoFeedSchema.js";
+import { CoListSchema, CoreCoListSchema } from "./schemaTypes/CoListSchema.js";
+import { CoMapSchema, CoMapSchemaInit, CoreCoMapSchema } from "./schemaTypes/CoMapSchema.js";
+import { CoOptionalSchema, CoreCoOptionalSchema } from "./schemaTypes/CoOptionalSchema.js";
+import { CoreCoValueSchema } from "./schemaTypes/CoValueSchema.js";
+import { CoreFileStreamSchema, FileStreamSchema } from "./schemaTypes/FileStreamSchema.js";
+import { CorePlainTextSchema, PlainTextSchema } from "./schemaTypes/PlainTextSchema.js";
+import { CoreRichTextSchema, RichTextSchema } from "./schemaTypes/RichTextSchema.js";
 import { InstanceOfSchemaCoValuesNullable } from "./typeConverters/InstanceOfSchemaCoValuesNullable.js";
 import { z } from "./zodReExport.js";
-export type WithHelpers<Base extends z.core.$ZodType, Helpers extends object> = Base & Helpers;
 export type ZodPrimitiveSchema = z.core.$ZodString | z.core.$ZodNumber | z.core.$ZodBoolean | z.core.$ZodNull | z.core.$ZodDate | z.core.$ZodLiteral;
-export type AnyCoUnionSchema = z.core.$ZodDiscriminatedUnion<((z.core.$ZodType & {
-    collaborative: true;
-}) | z.core.$ZodDiscriminatedUnion)[]>;
-export declare function isZodObject(schema: z.core.$ZodType): schema is z.ZodObject<any, any>;
-export declare function isZodArray(schema: z.core.$ZodType): schema is z.core.$ZodArray<any>;
-export declare function isZodCustom(schema: z.core.$ZodType): schema is z.core.$ZodCustom<any, any>;
-export declare function getDef<S extends z.core.$ZodType>(schema: S): S["_zod"]["def"];
-export type CoValueOrZodSchema = CoValueClass | AnyCoSchema;
-export type CoValueSchemaFromZodSchema<S extends z.core.$ZodType> = S extends z.core.$ZodType ? S extends AnyAccountSchema<infer Shape extends BaseAccountShape> ? AccountSchema<Shape> : S extends AnyCoRecordSchema<infer K, infer V> ? CoRecordSchema<K, V> : S extends AnyCoMapSchema<infer Shape, infer Config> ? CoMapSchema<Shape, Config> : S extends AnyCoListSchema<infer T> ? CoListSchema<T> : S extends AnyCoFeedSchema<infer T> ? CoFeedSchema<T> : S extends AnyPlainTextSchema ? PlainTextSchema : S extends AnyRichTextSchema ? RichTextSchema : S extends AnyFileStreamSchema ? FileStreamSchema : S extends z.core.$ZodOptional<infer Inner> ? CoValueSchemaFromZodSchema<Inner> : S extends z.core.$ZodUnion<infer Members extends readonly [
-    AnyDiscriminableCoSchema,
-    ...AnyDiscriminableCoSchema[]
-]> ? CoDiscriminatedUnionSchema<Members> : never : never;
-export type CoValueClassFromAnySchema<S extends CoValueOrZodSchema> = S extends CoValueClass<any> ? S : CoValueClass<InstanceOfSchema<S>> & CoValueFromRaw<InstanceOfSchema<S>> & (S extends AnyAccountSchema ? AccountClassEssentials : {});
+export type CoValueClassOrSchema = CoValueClass | CoreCoValueSchema;
+export type CoValueSchemaFromCoreSchema<S extends CoreCoValueSchema> = S extends CoreAccountSchema<infer Shape extends BaseAccountShape> ? AccountSchema<Shape> : S extends CoreCoRecordSchema<infer K, infer V> ? CoRecordSchema<K, V> : S extends CoreCoMapSchema<infer Shape, infer Config> ? CoMapSchema<Shape, Config> : S extends CoreCoListSchema<infer T> ? CoListSchema<T> : S extends CoreCoFeedSchema<infer T> ? CoFeedSchema<T> : S extends CorePlainTextSchema ? PlainTextSchema : S extends CoreRichTextSchema ? RichTextSchema : S extends CoreFileStreamSchema ? FileStreamSchema : S extends CoreCoOptionalSchema<infer Inner> ? CoOptionalSchema<Inner> : S extends CoreCoDiscriminatedUnionSchema<infer Members> ? CoDiscriminatedUnionSchema<Members> : never;
+export type CoValueClassFromAnySchema<S extends CoValueClassOrSchema> = S extends CoValueClass<any> ? S : CoValueClass<InstanceOfSchema<S>> & CoValueFromRaw<InstanceOfSchema<S>> & (S extends CoreAccountSchema ? AccountClassEssentials : {});
 type AccountClassEssentials = {
     fromRaw: <A extends Account>(this: AccountClass<A>, raw: RawAccount) => A;
     fromNode: <A extends Account>(this: AccountClass<A>, node: LocalNode) => A;
 };
-export type AnyCoSchema = AnyCoMapSchema | AnyAccountSchema | AnyCoRecordSchema | AnyCoListSchema | AnyCoFeedSchema | AnyCoUnionSchema | AnyCoOptionalSchema | AnyPlainTextSchema | AnyRichTextSchema | AnyFileStreamSchema;
-export type Loaded<T extends CoValueClass | AnyCoSchema, R extends ResolveQuery<T> = true> = Resolved<NonNullable<InstanceOfSchemaCoValuesNullable<T>>, R>;
-export type ResolveQuery<T extends CoValueClass | AnyCoSchema> = RefsToResolve<NonNullable<InstanceOfSchemaCoValuesNullable<T>>>;
-export type ResolveQueryStrict<T extends CoValueClass | AnyCoSchema, R extends ResolveQuery<T>> = RefsToResolveStrict<NonNullable<InstanceOfSchemaCoValuesNullable<T>>, R>;
-export type InitFor<T extends CoValueClass | AnyCoSchema> = T extends AnyCoMapSchema<infer Shape> ? Simplify<CoMapInitZod<Shape>> : never;
+export type AnyCoreCoValueSchema = CoreCoMapSchema | CoreAccountSchema | CoreCoRecordSchema | CoreCoListSchema | CoreCoFeedSchema | CoreCoDiscriminatedUnionSchema<any> | CoreCoOptionalSchema | CorePlainTextSchema | CoreRichTextSchema | CoreFileStreamSchema;
+type AnyZodSchema = z.core.$ZodType;
+export type AnyZodOrCoValueSchema = AnyZodSchema | CoreCoValueSchema;
+export type Loaded<T extends CoValueClassOrSchema, R extends ResolveQuery<T> = true> = Resolved<NonNullable<InstanceOfSchemaCoValuesNullable<T>>, R>;
+export type ResolveQuery<T extends CoValueClassOrSchema> = RefsToResolve<NonNullable<InstanceOfSchemaCoValuesNullable<T>>>;
+export type ResolveQueryStrict<T extends CoValueClassOrSchema, R extends ResolveQuery<T>> = RefsToResolveStrict<NonNullable<InstanceOfSchemaCoValuesNullable<T>>, R>;
+export type InitFor<T extends CoValueClassOrSchema> = T extends CoreCoMapSchema<infer Shape> ? Simplify<CoMapSchemaInit<Shape>> : never;
 export {};
 //# sourceMappingURL=zodSchema.d.ts.map

package/dist/tools/implementation/zodSchema/zodSchema.d.ts.map

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

package/dist/tools/internal.d.ts

@@ -23,6 +23,7 @@ export * from "./subscribe/SubscriptionScope.js";
 export * from "./subscribe/types.js";
 export * from "./subscribe/index.js";
 export * from "./lib/cache.js";
+export * from "./lib/utilityTypes.js";
 export * from "./implementation/createContext.js";
 export * from "./types.js";
 export * from "./implementation/zodSchema/zodSchema.js";
@@ -40,8 +41,8 @@ export * from "./implementation/zodSchema/typeConverters/InstanceOrPrimitiveOfSc
 export * from "./implementation/zodSchema/typeConverters/InstanceOrPrimitiveOfSchemaCoValuesNullable.js";
 export * from "./implementation/zodSchema/typeConverters/InstanceOfSchema.js";
 export * from "./implementation/zodSchema/typeConverters/InstanceOfSchemaCoValuesNullable.js";
-export * from "./implementation/zodSchema/runtimeConverters/zodSchemaToCoSchema.js";
-export * from "./implementation/zodSchema/runtimeConverters/zodFieldToCoFieldDef.js";
+export * from "./implementation/zodSchema/runtimeConverters/coValueSchemaTransformation.js";
+export * from "./implementation/zodSchema/runtimeConverters/schemaFieldToCoFieldDef.js";
 export * from "./coValues/extensions/imageDef.js";
 export * from "./implementation/ContextManager.js";
 import "./implementation/devtoolsFormatters.js";

package/dist/tools/internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/tools/internal.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,iCAAiC,CAAC;AAEhD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mCAAmC,CAAC;AAElD,cAAc,YAAY,CAAC;AAC3B,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC7D,cAAc,uDAAuD,CAAC;AACtE,cAAc,sEAAsE,CAAC;AACrF,cAAc,0DAA0D,CAAC;AACzE,cAAc,wDAAwD,CAAC;AACvE,cAAc,wDAAwD,CAAC;AACvE,cAAc,yDAAyD,CAAC;AACxE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,0EAA0E,CAAC;AACzF,cAAc,0FAA0F,CAAC;AACzG,cAAc,+DAA+D,CAAC;AAC9E,cAAc,+EAA+E,CAAC;AAC9F,cAAc,qEAAqE,CAAC;AACpF,cAAc,sEAAsE,CAAC;AACrF,cAAc,mCAAmC,CAAC;AAElD,cAAc,oCAAoC,CAAC;AAEnD,OAAO,wCAAwC,CAAC"}
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/tools/internal.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,iCAAiC,CAAC;AAEhD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wCAAwC,CAAC;AACvD,cAAc,0CAA0C,CAAC;AACzD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,mCAAmC,CAAC;AAElD,cAAc,YAAY,CAAC;AAC3B,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC7D,cAAc,uDAAuD,CAAC;AACtE,cAAc,sEAAsE,CAAC;AACrF,cAAc,0DAA0D,CAAC;AACzE,cAAc,wDAAwD,CAAC;AACvE,cAAc,wDAAwD,CAAC;AACvE,cAAc,yDAAyD,CAAC;AACxE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,0EAA0E,CAAC;AACzF,cAAc,0FAA0F,CAAC;AACzG,cAAc,+DAA+D,CAAC;AAC9E,cAAc,+EAA+E,CAAC;AAC9F,cAAc,6EAA6E,CAAC;AAC5F,cAAc,yEAAyE,CAAC;AACxF,cAAc,mCAAmC,CAAC;AAElD,cAAc,oCAAoC,CAAC;AAEnD,OAAO,wCAAwC,CAAC"}

package/dist/tools/lib/utilityTypes.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Make any property optional if its type includes `undefined`, preserving the type as-is
+ */
+export type PartialOnUndefined<T> = {
+    [K in keyof T as undefined extends T[K] ? never : K]: T[K];
+} & {
+    [K in keyof T as undefined extends T[K] ? K : never]?: T[K];
+};
+/**
+ * Useful to flatten the type output to improve type hints shown in editors.
+ * And also to transform an interface into a type to aide with assignability.
+ *
+ * Taken from https://github.com/sindresorhus/type-fest/blob/main/source/simplify.d.ts
+ */
+export type Simplify<T> = {
+    [KeyType in keyof T]: T[KeyType];
+} & {};
+//# sourceMappingURL=utilityTypes.d.ts.map

package/dist/tools/lib/utilityTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utilityTypes.d.ts","sourceRoot":"","sources":["../../../src/tools/lib/utilityTypes.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;KACjC,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3D,GAAG;KACD,CAAC,IAAI,MAAM,CAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;CAAE,GAAG,EAAE,CAAC"}

package/dist/tools/subscribe/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EACL,OAAO,EACP,UAAU,EAGX,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,qEAQnD;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/subscribe/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EACL,OAAO,EACP,UAAU,EAGX,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,qEAUnD;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,EAC7C,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,EAClB,GAAG,EAAE,UAAU,EACf,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;EAgBxC"}

package/dist/tools/testing.d.ts

@@ -1,11 +1,11 @@
 import { LocalNode } from "cojson";
 import { PureJSCrypto } from "cojson/dist/crypto/PureJSCrypto";
-import { Account, AccountClass, type AnonymousJazzAgent, AnyAccountSchema, CoValueFromRaw, InstanceOfSchema, JazzContextManager, JazzContextManagerAuthProps, JazzContextManagerBaseProps } from "./internal.js";
+import { Account, AccountClass, type AnonymousJazzAgent, CoValueFromRaw, CoreAccountSchema, InstanceOfSchema, JazzContextManager, JazzContextManagerAuthProps, JazzContextManagerBaseProps } from "./internal.js";
 export declare class TestJSCrypto extends PureJSCrypto {
     static create(): Promise<PureJSCrypto>;
 }
 export declare function getPeerConnectedToTestSyncServer(): import("cojson").Peer;
-export declare function createJazzTestAccount<S extends (AccountClass<Account> & CoValueFromRaw<Account>) | AnyAccountSchema>(options?: {
+export declare function createJazzTestAccount<S extends (AccountClass<Account> & CoValueFromRaw<Account>) | CoreAccountSchema>(options?: {
     isCurrentActiveAccount?: boolean;
     AccountSchema?: S;
     creationProps?: Record<string, unknown>;

package/dist/tools/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/tools/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,YAAY,EACZ,KAAK,kBAAkB,EACvB,gBAAgB,EAEhB,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,EAM5B,MAAM,eAAe,CAAC;AAOvB,qBAAa,YAAa,SAAQ,YAAY;WAC/B,MAAM;CAoBpB;AAED,wBAAgB,gCAAgC,0BAiC/C;AAKD,wBAAsB,qBAAqB,CACzC,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,EACpB,OAAO,CAAC,EAAE;IACV,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAuD/B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QAEhD;AAED,wBAAsB,mBAAmB;;GASxC;AAED,MAAM,MAAM,2BAA2B,CAAC,GAAG,SAAS,OAAO,IACzD,2BAA2B,CAAC,GAAG,CAAC,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACxD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEJ,qBAAa,sBAAsB,CACjC,GAAG,SAAS,OAAO,CACnB,SAAQ,kBAAkB,CAAC,GAAG,EAAE,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACjE,MAAM,CAAC,kBAAkB,CAAC,GAAG,SAAS,OAAO,EAC3C,OAAO,CAAC,EAAE,GAAG,GAAG;QAAE,KAAK,EAAE,kBAAkB,CAAA;KAAE,EAC7C,KAAK,CAAC,EAAE,2BAA2B,CAAC,GAAG,CAAC;IAS1C,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,OAAO,EACpC,OAAO,EAAE,GAAG,EACZ,KAAK,CAAC,EAAE,2BAA2B,CAAC,GAAG,CAAC;IA0C1C,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,OAAO,EAClC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,kBAAkB,CAAA;KAAE,EACxC,KAAK,GAAE,2BAA2B,CAAC,GAAG,CAAM;IAmBxC,aAAa,CACjB,KAAK,EAAE,2BAA2B,CAAC,GAAG,CAAC,EACvC,SAAS,CAAC,EAAE,2BAA2B;;uBAqEq3K,cAAc;;;;;;;;CAvC76K;AAED,wBAAsB,YAAY,CAChC,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,KAAK,GAAE,QAAQ,GAAG,QAAmB,EACrC,KAAK,GAAE,QAAQ,GAAG,QAAmB,iBAYtC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,UAAkB,GACnB,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,oBAgB/B"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/tools/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,YAAY,EACZ,KAAK,kBAAkB,EAEvB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,EAM5B,MAAM,eAAe,CAAC;AAOvB,qBAAa,YAAa,SAAQ,YAAY;WAC/B,MAAM;CAoBpB;AAED,wBAAgB,gCAAgC,0BAiC/C;AAKD,wBAAsB,qBAAqB,CACzC,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,iBAAiB,EACrB,OAAO,CAAC,EAAE;IACV,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAuD/B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QAEhD;AAED,wBAAsB,mBAAmB;;GASxC;AAED,MAAM,MAAM,2BAA2B,CAAC,GAAG,SAAS,OAAO,IACzD,2BAA2B,CAAC,GAAG,CAAC,GAAG;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACxD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEJ,qBAAa,sBAAsB,CACjC,GAAG,SAAS,OAAO,CACnB,SAAQ,kBAAkB,CAAC,GAAG,EAAE,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACjE,MAAM,CAAC,kBAAkB,CAAC,GAAG,SAAS,OAAO,EAC3C,OAAO,CAAC,EAAE,GAAG,GAAG;QAAE,KAAK,EAAE,kBAAkB,CAAA;KAAE,EAC7C,KAAK,CAAC,EAAE,2BAA2B,CAAC,GAAG,CAAC;IAS1C,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,OAAO,EACpC,OAAO,EAAE,GAAG,EACZ,KAAK,CAAC,EAAE,2BAA2B,CAAC,GAAG,CAAC;IA0C1C,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,OAAO,EAClC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,kBAAkB,CAAA;KAAE,EACxC,KAAK,GAAE,2BAA2B,CAAC,GAAG,CAAM;IAmBxC,aAAa,CACjB,KAAK,EAAE,2BAA2B,CAAC,GAAG,CAAC,EACvC,SAAS,CAAC,EAAE,2BAA2B;;uBAqE47K,cAAc;;;;;;;;CAvCp/K;AAED,wBAAsB,YAAY,CAChC,CAAC,EAAE,OAAO,EACV,CAAC,EAAE,OAAO,EACV,KAAK,GAAE,QAAQ,GAAG,QAAmB,EACrC,KAAK,GAAE,QAAQ,GAAG,QAAmB,iBAYtC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,UAAkB,GACnB,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,oBAgB/B"}

package/dist/worker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAmB,MAAM,QAAQ,CAAC;AACtE,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,OAAO,EACP,YAAY,EAEZ,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,KAAK,aAAa,CAChB,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,IAClB;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,iCAAiC;AACjC,wBAAsB,WAAW,CAC/B,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,EACpB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;YA0EI,gBAAgB,CAAC,CAAC,CAAC;;;uBAJJ,KAAK,CAAC,WAAW,CAAC;;;;0CAWtB,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI;;GASrE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAmB,MAAM,QAAQ,CAAC;AACtE,OAAO,EACL,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,KAAK,aAAa,CAChB,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,IAClB;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,uBAAuB,CAAC;IACpC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,iCAAiC;AACjC,wBAAsB,WAAW,CAC/B,CAAC,SACG,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,GACjD,gBAAgB,EACpB,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;YA0EI,gBAAgB,CAAC,CAAC,CAAC;;;uBAJJ,KAAK,CAAC,WAAW,CAAC;;;;0CAWtB,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI;;GASrE"}

package/dist/worker/index.js

@@ -14,7 +14,7 @@ async function startWorker(options) {
     accountID = process.env.JAZZ_WORKER_ACCOUNT,
     accountSecret = process.env.JAZZ_WORKER_SECRET,
     syncServer = "wss://cloud.jazz.tools",
-    AccountSchema: AccountSchema2 = Account
+    AccountSchema = Account
   } = options;
   let node = void 0;
   const peersToLoadFrom = [];
@@ -50,7 +50,7 @@ async function startWorker(options) {
       accountID,
       secret: accountSecret
     },
-    AccountSchema: AccountSchema2,
+    AccountSchema,
     // TODO: locked sessions similar to browser
     sessionProvider: randomSessionProvider,
     peersToLoadFrom,

package/dist/worker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/worker/index.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, LocalNode, Peer } from \"cojson\";\nimport {\n  type AnyWebSocketConstructor,\n  WebSocketPeerWithReconnection,\n} from \"cojson-transport-ws\";\nimport { WasmCrypto } from \"cojson/crypto/WasmCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AccountSchema,\n  AnyAccountSchema,\n  CoValueFromRaw,\n  Inbox,\n  InstanceOfSchema,\n  createJazzContextFromExistingCredentials,\n  randomSessionProvider,\n} from \"jazz-tools\";\n\ntype WorkerOptions<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n> = {\n  accountID?: string;\n  accountSecret?: string;\n  syncServer?: string;\n  WebSocket?: AnyWebSocketConstructor;\n  AccountSchema?: S;\n  crypto?: CryptoProvider;\n};\n\n/** @category Context Creation */\nexport async function startWorker<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n>(options: WorkerOptions<S>) {\n  const {\n    accountID = process.env.JAZZ_WORKER_ACCOUNT,\n    accountSecret = process.env.JAZZ_WORKER_SECRET,\n    syncServer = \"wss://cloud.jazz.tools\",\n    AccountSchema = Account as unknown as S,\n  } = options;\n\n  let node: LocalNode | undefined = undefined;\n\n  const peersToLoadFrom: Peer[] = [];\n\n  const wsPeer = new WebSocketPeerWithReconnection({\n    peer: syncServer,\n    reconnectionTimeout: 100,\n    addPeer: (peer) => {\n      if (node) {\n        node.syncManager.addPeer(peer);\n      } else {\n        peersToLoadFrom.push(peer);\n      }\n    },\n    removePeer: () => {},\n    WebSocketConstructor: options.WebSocket,\n  });\n\n  wsPeer.enable();\n\n  if (!accountID) {\n    throw new Error(\"No accountID provided\");\n  }\n  if (!accountSecret) {\n    throw new Error(\"No accountSecret provided\");\n  }\n  if (!accountID.startsWith(\"co_\")) {\n    throw new Error(\"Invalid accountID\");\n  }\n  if (!accountSecret?.startsWith(\"sealerSecret_\")) {\n    throw new Error(\"Invalid accountSecret\");\n  }\n\n  const context = await createJazzContextFromExistingCredentials({\n    credentials: {\n      accountID: accountID,\n      secret: accountSecret as AgentSecret,\n    },\n    AccountSchema,\n    // TODO: locked sessions similar to browser\n    sessionProvider: randomSessionProvider,\n    peersToLoadFrom,\n    crypto: options.crypto ?? (await WasmCrypto.create()),\n  });\n\n  const account = context.account as InstanceOfSchema<S>;\n  node = account._raw.core.node;\n\n  if (!account._refs.profile?.id) {\n    throw new Error(\"Account has no profile\");\n  }\n\n  const inbox = await Inbox.load(account);\n\n  async function done() {\n    await context.account.waitForAllCoValuesSync();\n\n    wsPeer.disable();\n    context.done();\n  }\n\n  const inboxPublicApi = {\n    subscribe: inbox.subscribe.bind(inbox) as Inbox[\"subscribe\"],\n  };\n\n  return {\n    worker: context.account as InstanceOfSchema<S>,\n    experimental: {\n      inbox: inboxPublicApi,\n    },\n    waitForConnection() {\n      return wsPeer.waitUntilConnected();\n    },\n    subscribeToConnectionChange(listener: (connected: boolean) => void) {\n      wsPeer.subscribe(listener);\n\n      return () => {\n        wsPeer.unsubscribe(listener);\n      };\n    },\n    done,\n  };\n}\n"],"mappings":";AACA;AAAA,EAEE;AAAA,OACK;AACP,SAAS,kBAAkB;AAC3B;AAAA,EACE;AAAA,EAKA;AAAA,EAEA;AAAA,EACA;AAAA,OACK;AAgBP,eAAsB,YAIpB,SAA2B;AAC3B,QAAM;AAAA,IACJ,YAAY,QAAQ,IAAI;AAAA,IACxB,gBAAgB,QAAQ,IAAI;AAAA,IAC5B,aAAa;AAAA,IACb,eAAAA,iBAAgB;AAAA,EAClB,IAAI;AAEJ,MAAI,OAA8B;AAElC,QAAM,kBAA0B,CAAC;AAEjC,QAAM,SAAS,IAAI,8BAA8B;AAAA,IAC/C,MAAM;AAAA,IACN,qBAAqB;AAAA,IACrB,SAAS,CAAC,SAAS;AACjB,UAAI,MAAM;AACR,aAAK,YAAY,QAAQ,IAAI;AAAA,MAC/B,OAAO;AACL,wBAAgB,KAAK,IAAI;AAAA,MAC3B;AAAA,IACF;AAAA,IACA,YAAY,MAAM;AAAA,IAAC;AAAA,IACnB,sBAAsB,QAAQ;AAAA,EAChC,CAAC;AAED,SAAO,OAAO;AAEd,MAAI,CAAC,WAAW;AACd,UAAM,IAAI,MAAM,uBAAuB;AAAA,EACzC;AACA,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM,2BAA2B;AAAA,EAC7C;AACA,MAAI,CAAC,UAAU,WAAW,KAAK,GAAG;AAChC,UAAM,IAAI,MAAM,mBAAmB;AAAA,EACrC;AACA,MAAI,CAAC,eAAe,WAAW,eAAe,GAAG;AAC/C,UAAM,IAAI,MAAM,uBAAuB;AAAA,EACzC;AAEA,QAAM,UAAU,MAAM,yCAAyC;AAAA,IAC7D,aAAa;AAAA,MACX;AAAA,MACA,QAAQ;AAAA,IACV;AAAA,IACA,eAAAA;AAAA;AAAA,IAEA,iBAAiB;AAAA,IACjB;AAAA,IACA,QAAQ,QAAQ,UAAW,MAAM,WAAW,OAAO;AAAA,EACrD,CAAC;AAED,QAAM,UAAU,QAAQ;AACxB,SAAO,QAAQ,KAAK,KAAK;AAEzB,MAAI,CAAC,QAAQ,MAAM,SAAS,IAAI;AAC9B,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AAEA,QAAM,QAAQ,MAAM,MAAM,KAAK,OAAO;AAEtC,iBAAe,OAAO;AACpB,UAAM,QAAQ,QAAQ,uBAAuB;AAE7C,WAAO,QAAQ;AACf,YAAQ,KAAK;AAAA,EACf;AAEA,QAAM,iBAAiB;AAAA,IACrB,WAAW,MAAM,UAAU,KAAK,KAAK;AAAA,EACvC;AAEA,SAAO;AAAA,IACL,QAAQ,QAAQ;AAAA,IAChB,cAAc;AAAA,MACZ,OAAO;AAAA,IACT;AAAA,IACA,oBAAoB;AAClB,aAAO,OAAO,mBAAmB;AAAA,IACnC;AAAA,IACA,4BAA4B,UAAwC;AAClE,aAAO,UAAU,QAAQ;AAEzB,aAAO,MAAM;AACX,eAAO,YAAY,QAAQ;AAAA,MAC7B;AAAA,IACF;AAAA,IACA;AAAA,EACF;AACF;","names":["AccountSchema"]}
+{"version":3,"sources":["../../src/worker/index.ts"],"sourcesContent":["import { AgentSecret, CryptoProvider, LocalNode, Peer } from \"cojson\";\nimport {\n  type AnyWebSocketConstructor,\n  WebSocketPeerWithReconnection,\n} from \"cojson-transport-ws\";\nimport { WasmCrypto } from \"cojson/crypto/WasmCrypto\";\nimport {\n  Account,\n  AccountClass,\n  AnyAccountSchema,\n  CoValueFromRaw,\n  Inbox,\n  InstanceOfSchema,\n  createJazzContextFromExistingCredentials,\n  randomSessionProvider,\n} from \"jazz-tools\";\n\ntype WorkerOptions<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n> = {\n  accountID?: string;\n  accountSecret?: string;\n  syncServer?: string;\n  WebSocket?: AnyWebSocketConstructor;\n  AccountSchema?: S;\n  crypto?: CryptoProvider;\n};\n\n/** @category Context Creation */\nexport async function startWorker<\n  S extends\n    | (AccountClass<Account> & CoValueFromRaw<Account>)\n    | AnyAccountSchema,\n>(options: WorkerOptions<S>) {\n  const {\n    accountID = process.env.JAZZ_WORKER_ACCOUNT,\n    accountSecret = process.env.JAZZ_WORKER_SECRET,\n    syncServer = \"wss://cloud.jazz.tools\",\n    AccountSchema = Account as unknown as S,\n  } = options;\n\n  let node: LocalNode | undefined = undefined;\n\n  const peersToLoadFrom: Peer[] = [];\n\n  const wsPeer = new WebSocketPeerWithReconnection({\n    peer: syncServer,\n    reconnectionTimeout: 100,\n    addPeer: (peer) => {\n      if (node) {\n        node.syncManager.addPeer(peer);\n      } else {\n        peersToLoadFrom.push(peer);\n      }\n    },\n    removePeer: () => {},\n    WebSocketConstructor: options.WebSocket,\n  });\n\n  wsPeer.enable();\n\n  if (!accountID) {\n    throw new Error(\"No accountID provided\");\n  }\n  if (!accountSecret) {\n    throw new Error(\"No accountSecret provided\");\n  }\n  if (!accountID.startsWith(\"co_\")) {\n    throw new Error(\"Invalid accountID\");\n  }\n  if (!accountSecret?.startsWith(\"sealerSecret_\")) {\n    throw new Error(\"Invalid accountSecret\");\n  }\n\n  const context = await createJazzContextFromExistingCredentials({\n    credentials: {\n      accountID: accountID,\n      secret: accountSecret as AgentSecret,\n    },\n    AccountSchema,\n    // TODO: locked sessions similar to browser\n    sessionProvider: randomSessionProvider,\n    peersToLoadFrom,\n    crypto: options.crypto ?? (await WasmCrypto.create()),\n  });\n\n  const account = context.account as InstanceOfSchema<S>;\n  node = account._raw.core.node;\n\n  if (!account._refs.profile?.id) {\n    throw new Error(\"Account has no profile\");\n  }\n\n  const inbox = await Inbox.load(account);\n\n  async function done() {\n    await context.account.waitForAllCoValuesSync();\n\n    wsPeer.disable();\n    context.done();\n  }\n\n  const inboxPublicApi = {\n    subscribe: inbox.subscribe.bind(inbox) as Inbox[\"subscribe\"],\n  };\n\n  return {\n    worker: context.account as InstanceOfSchema<S>,\n    experimental: {\n      inbox: inboxPublicApi,\n    },\n    waitForConnection() {\n      return wsPeer.waitUntilConnected();\n    },\n    subscribeToConnectionChange(listener: (connected: boolean) => void) {\n      wsPeer.subscribe(listener);\n\n      return () => {\n        wsPeer.unsubscribe(listener);\n      };\n    },\n    done,\n  };\n}\n"],"mappings":";AACA;AAAA,EAEE;AAAA,OACK;AACP,SAAS,kBAAkB;AAC3B;AAAA,EACE;AAAA,EAIA;AAAA,EAEA;AAAA,EACA;AAAA,OACK;AAgBP,eAAsB,YAIpB,SAA2B;AAC3B,QAAM;AAAA,IACJ,YAAY,QAAQ,IAAI;AAAA,IACxB,gBAAgB,QAAQ,IAAI;AAAA,IAC5B,aAAa;AAAA,IACb,gBAAgB;AAAA,EAClB,IAAI;AAEJ,MAAI,OAA8B;AAElC,QAAM,kBAA0B,CAAC;AAEjC,QAAM,SAAS,IAAI,8BAA8B;AAAA,IAC/C,MAAM;AAAA,IACN,qBAAqB;AAAA,IACrB,SAAS,CAAC,SAAS;AACjB,UAAI,MAAM;AACR,aAAK,YAAY,QAAQ,IAAI;AAAA,MAC/B,OAAO;AACL,wBAAgB,KAAK,IAAI;AAAA,MAC3B;AAAA,IACF;AAAA,IACA,YAAY,MAAM;AAAA,IAAC;AAAA,IACnB,sBAAsB,QAAQ;AAAA,EAChC,CAAC;AAED,SAAO,OAAO;AAEd,MAAI,CAAC,WAAW;AACd,UAAM,IAAI,MAAM,uBAAuB;AAAA,EACzC;AACA,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM,2BAA2B;AAAA,EAC7C;AACA,MAAI,CAAC,UAAU,WAAW,KAAK,GAAG;AAChC,UAAM,IAAI,MAAM,mBAAmB;AAAA,EACrC;AACA,MAAI,CAAC,eAAe,WAAW,eAAe,GAAG;AAC/C,UAAM,IAAI,MAAM,uBAAuB;AAAA,EACzC;AAEA,QAAM,UAAU,MAAM,yCAAyC;AAAA,IAC7D,aAAa;AAAA,MACX;AAAA,MACA,QAAQ;AAAA,IACV;AAAA,IACA;AAAA;AAAA,IAEA,iBAAiB;AAAA,IACjB;AAAA,IACA,QAAQ,QAAQ,UAAW,MAAM,WAAW,OAAO;AAAA,EACrD,CAAC;AAED,QAAM,UAAU,QAAQ;AACxB,SAAO,QAAQ,KAAK,KAAK;AAEzB,MAAI,CAAC,QAAQ,MAAM,SAAS,IAAI;AAC9B,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AAEA,QAAM,QAAQ,MAAM,MAAM,KAAK,OAAO;AAEtC,iBAAe,OAAO;AACpB,UAAM,QAAQ,QAAQ,uBAAuB;AAE7C,WAAO,QAAQ;AACf,YAAQ,KAAK;AAAA,EACf;AAEA,QAAM,iBAAiB;AAAA,IACrB,WAAW,MAAM,UAAU,KAAK,KAAK;AAAA,EACvC;AAEA,SAAO;AAAA,IACL,QAAQ,QAAQ;AAAA,IAChB,cAAc;AAAA,MACZ,OAAO;AAAA,IACT;AAAA,IACA,oBAAoB;AAClB,aAAO,OAAO,mBAAmB;AAAA,IACnC;AAAA,IACA,4BAA4B,UAAwC;AAClE,aAAO,UAAU,QAAQ;AAEzB,aAAO,MAAM;AACX,eAAO,YAAY,QAAQ;AAAA,MAC7B;AAAA,IACF;AAAA,IACA;AAAA,EACF;AACF;","names":[]}

package/package.json

@@ -139,7 +139,7 @@
   },
   "type": "module",
   "license": "MIT",
-  "version": "0.15.16",
+  "version": "0.16.1",
   "dependencies": {
     "@manuscripts/prosemirror-recreate-steps": "^0.1.4",
     "@scure/base": "1.2.1",
@@ -157,10 +157,10 @@
     "prosemirror-schema-basic": "^1.2.2",
     "prosemirror-state": "^1.4.3",
     "prosemirror-transform": "^1.9.0",
-    "zod": "3.25.28",
-    "cojson": "0.15.16",
-    "cojson-storage-indexeddb": "0.15.16",
-    "cojson-transport-ws": "0.15.16"
+    "zod": "3.25.76",
+    "cojson": "0.16.1",
+    "cojson-storage-indexeddb": "0.16.1",
+    "cojson-transport-ws": "0.16.1"
   },
   "devDependencies": {
     "@scure/bip39": "^1.3.0",

package/src/browser/index.ts

@@ -1,9 +1,7 @@
 import {
   Account,
   CoValue,
-  CoValueClass,
-  CoValueOrZodSchema,
-  ID,
+  CoValueClassOrSchema,
   InviteSecret,
   createInviteLink as baseCreateInviteLink,
   consumeInviteLink,
@@ -36,7 +34,7 @@ export { parseInviteLink } from "jazz-tools";
 
 /** @category Invite Links */
 export async function consumeInviteLinkFromWindowLocation<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
 >({
   as,
   forValueHint,

package/src/browser-media-images/index.ts

@@ -17,7 +17,7 @@ export async function createImage(
     owner?: Group | Account;
     maxSize?: 256 | 1024 | 2048;
   },
-): Promise<Loaded<typeof ImageDefinition>> {
+): Promise<Loaded<typeof ImageDefinition, { $each: true }>> {
   // Get the original size of the image
   const { width: originalWidth, height: originalHeight } =
     await getImageSize(imageBlobOrFile);

package/src/react/hooks.tsx

@@ -1,12 +1,12 @@
 import { consumeInviteLinkFromWindowLocation } from "jazz-tools/browser";
 import { useEffect } from "react";
 
-import { CoValueOrZodSchema } from "jazz-tools";
+import { CoValueClassOrSchema } from "jazz-tools";
 import { useJazzContext } from "jazz-tools/react-core";
 
 export { useCoState, useAuthSecretStorage } from "jazz-tools/react-core";
 
-export function useAcceptInvite<S extends CoValueOrZodSchema>({
+export function useAcceptInvite<S extends CoValueClassOrSchema>({
   invitedObjectSchema,
   onAccept,
   forValueHint,

package/src/react-core/hooks.ts

@@ -11,7 +11,7 @@ import {
   AnonymousJazzAgent,
   AnyAccountSchema,
   CoValue,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
   InboxSender,
   InstanceOfSchema,
   JazzContextManager,
@@ -20,7 +20,7 @@ import {
   ResolveQuery,
   ResolveQueryStrict,
   SubscriptionScope,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
 } from "jazz-tools";
 import { JazzContext, JazzContextManagerContext } from "./provider.js";
 import { getCurrentAccountFromContextManager } from "./utils.js";
@@ -80,7 +80,7 @@ export function useIsAuthenticated() {
 }
 
 function useCoValueSubscription<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
   const R extends ResolveQuery<S>,
 >(
   Schema: S,
@@ -107,7 +107,7 @@ function useCoValueSubscription<
       options?.resolve ?? true,
       id,
       {
-        ref: anySchemaToCoSchema(Schema),
+        ref: coValueClassFromCoValueClassOrSchema(Schema),
         optional: true,
       },
     );
@@ -142,7 +142,7 @@ function useCoValueSubscription<
 }
 
 export function useCoState<
-  S extends CoValueOrZodSchema,
+  S extends CoValueClassOrSchema,
   const R extends ResolveQuery<S> = true,
 >(
   Schema: S,
@@ -198,7 +198,7 @@ function useAccountSubscription<
 
     const node = contextManager.getCurrentValue()!.node;
     const subscription = new SubscriptionScope<any>(node, resolve, agent.id, {
-      ref: anySchemaToCoSchema(Schema),
+      ref: coValueClassFromCoValueClassOrSchema(Schema),
       optional: true,
     });
 

package/src/react-core/tests/useAccount.test.ts

@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-import { RefsToResolve, co, z, zodSchemaToCoSchema } from "jazz-tools";
+import { RefsToResolve, co, z } from "jazz-tools";
 import { beforeEach, describe, expect, it } from "vitest";
 import { useAccount, useJazzContextManager } from "../hooks.js";
 import { useIsAuthenticated } from "../index.js";
@@ -46,7 +46,7 @@ describe("useAccount", () => {
       });
 
     const account = await createJazzTestAccount({
-      AccountSchema: zodSchemaToCoSchema(AccountSchema),
+      AccountSchema,
     });
 
     const { result } = renderHook(

package/src/react-core/tests/useCoState.test.ts

@@ -520,12 +520,13 @@ describe("useCoState", () => {
     const Message = co.map({
       content: CoRichText,
     });
+    const Messages = co.list(Message);
     const Thread = co.map({
-      messages: co.list(Message),
+      messages: Messages,
     });
 
     const thread = Thread.create({
-      messages: Thread.def.shape.messages.create([
+      messages: Messages.create([
         Message.create({
           content: CoRichText.create("Hello man!"),
         }),

package/src/react-native-core/hooks.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 
-import { CoValueOrZodSchema, parseInviteLink } from "jazz-tools";
+import { CoValueClassOrSchema, parseInviteLink } from "jazz-tools";
 import { useJazzContext } from "jazz-tools/react-core";
 import { Linking } from "react-native";
 
@@ -15,7 +15,7 @@ export {
   useAccount,
 } from "jazz-tools/react-core";
 
-export function useAcceptInviteNative<S extends CoValueOrZodSchema>({
+export function useAcceptInviteNative<S extends CoValueClassOrSchema>({
   invitedObjectSchema,
   onAccept,
   forValueHint,

package/src/svelte/jazz.class.svelte.ts

@@ -2,21 +2,24 @@ import type {
   Account,
   AccountClass,
   AnyAccountSchema,
+  CoValueClassOrSchema,
   CoValueFromRaw,
-  CoValueOrZodSchema,
   InstanceOfSchema,
   Loaded,
   ResolveQuery,
   ResolveQueryStrict,
 } from "jazz-tools";
-import { anySchemaToCoSchema, subscribeToCoValue } from "jazz-tools";
+import {
+  coValueClassFromCoValueClassOrSchema,
+  subscribeToCoValue,
+} from "jazz-tools";
 import { untrack } from "svelte";
 import { createSubscriber } from "svelte/reactivity";
 import { useIsAuthenticated } from "./auth/useIsAuthenticated.svelte.js";
 import { getJazzContext } from "./jazz.svelte";
 
 export class CoState<
-  V extends CoValueOrZodSchema,
+  V extends CoValueClassOrSchema,
   R extends ResolveQuery<V> = true,
 > {
   #value: Loaded<V, R> | undefined | null = undefined;
@@ -47,10 +50,10 @@ export class CoState<
         const agent = "me" in ctx ? ctx.me : ctx.guest;
 
         const unsubscribe = subscribeToCoValue(
-          anySchemaToCoSchema(Schema),
+          coValueClassFromCoValueClassOrSchema(Schema),
           id,
           {
-            // @ts-expect-error The resolve query type isn't compatible with the anySchemaToCoSchema conversion
+            // @ts-expect-error The resolve query type isn't compatible with the coValueClassFromCoValueClassOrSchema conversion
             resolve: options?.resolve,
             loadAs: agent,
             onUnavailable: () => {
@@ -112,10 +115,10 @@ export class AccountCoState<
         const me = ctx.me;
 
         const unsubscribe = subscribeToCoValue(
-          anySchemaToCoSchema(Schema),
+          coValueClassFromCoValueClassOrSchema(Schema),
           me.id,
           {
-            // @ts-expect-error The resolve query type isn't compatible with the anySchemaToCoSchema conversion
+            // @ts-expect-error The resolve query type isn't compatible with the coValueClassFromCoValueClassOrSchema conversion
             resolve: options?.resolve,
             loadAs: me,
             onUnavailable: () => {

package/src/svelte/jazz.svelte.ts

@@ -1,7 +1,7 @@
 import type {
   AccountClass,
   AuthSecretStorage,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
   ID,
   InstanceOfSchema,
   JazzContextType,
@@ -66,7 +66,7 @@ export function getAuthSecretStorage() {
  * @param forValueHint - Hint for the value.
  * @returns The accept invite hook.
  */
-export class InviteListener<V extends CoValueOrZodSchema> {
+export class InviteListener<V extends CoValueClassOrSchema> {
   constructor({
     invitedObjectSchema,
     onAccept,

package/src/tools/coValues/CoValueBase.ts

@@ -1,5 +1,5 @@
 import { ControlledAccount, RawAccount, type RawCoValue } from "cojson";
-import { z } from "../implementation/zodSchema/zodReExport.js";
+import { CoreCoValueSchema } from "../implementation/zodSchema/schemaTypes/CoValueSchema.js";
 import {
   AnonymousJazzAgent,
   CoValue,
@@ -8,13 +8,14 @@ import {
   ID,
   RegisteredSchemas,
   accessChildById,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   coValuesCache,
   inspect,
   isCoValueSchema,
 } from "../internal.js";
 import type {
   Account,
+  CoValueClassOrSchema,
   Group,
   InstanceOfSchemaCoValuesNullable,
 } from "../internal.js";
@@ -46,9 +47,9 @@ export class CoValueBase implements CoValue {
 
     if (agent instanceof ControlledAccount) {
       return coValuesCache.get(agent.account, () =>
-        anySchemaToCoSchema(RegisteredSchemas["Account"]).fromRaw(
-          agent.account,
-        ),
+        coValueClassFromCoValueClassOrSchema(
+          RegisteredSchemas["Account"],
+        ).fromRaw(agent.account),
       );
     }
 
@@ -81,24 +82,11 @@ export class CoValueBase implements CoValue {
   }
 
   /** @category Type Helpers */
-  castAs<
-    S extends
-      | CoValueClass
-      | z.core.$ZodType
-      | (z.core.$ZodObject<any, any> & {
-          builtin: "Account";
-          migration?: (account: any, creationProps?: { name: string }) => void;
-        })
-      | (z.core.$ZodCustom<any, any> & { builtin: "FileStream" })
-      | (z.core.$ZodCustom<any, any> & {
-          builtin: "CoFeed";
-          element: z.core.$ZodType;
-        }),
-  >(
+  castAs<S extends CoValueClassOrSchema>(
     schema: S,
   ): S extends CoValueClass
     ? InstanceType<S>
-    : S extends z.core.$ZodType
+    : S extends CoreCoValueSchema
       ? NonNullable<InstanceOfSchemaCoValuesNullable<S>>
       : never {
     const cl = isCoValueSchema(schema) ? schema.getCoValueClass() : schema;

package/src/tools/coValues/account.ts

@@ -16,12 +16,12 @@ import {
 } from "cojson";
 import {
   AnonymousJazzAgent,
-  AnyAccountSchema,
   type CoMap,
   type CoValue,
   CoValueBase,
   CoValueClass,
-  CoValueOrZodSchema,
+  CoValueClassOrSchema,
+  CoreAccountSchema,
   type Group,
   ID,
   InstanceOfSchema,
@@ -40,7 +40,7 @@ import {
   SubscribeRestArgs,
   accessChildByKey,
   activeAccountContext,
-  anySchemaToCoSchema,
+  coValueClassFromCoValueClassOrSchema,
   coValuesCache,
   createInboxRoot,
   ensureCoValueLoaded,
@@ -254,7 +254,7 @@ export class Account extends CoValueBase implements CoValue {
     return value._owner.getRoleOf(this.id) === "admin";
   }
 
-  async acceptInvite<S extends CoValueOrZodSchema>(
+  async acceptInvite<S extends CoValueClassOrSchema>(
     valueID: string,
     inviteSecret: InviteSecret,
     coValueClass: S,
@@ -268,9 +268,13 @@ export class Account extends CoValueBase implements CoValue {
       inviteSecret,
     );
 
-    return loadCoValue(anySchemaToCoSchema(coValueClass), valueID, {
-      loadAs: this,
-    }) as Resolved<InstanceOrPrimitiveOfSchema<S>, true> | null;
+    return loadCoValue(
+      coValueClassFromCoValueClassOrSchema(coValueClass),
+      valueID,
+      {
+        loadAs: this,
+      },
+    ) as Resolved<InstanceOrPrimitiveOfSchema<S>, true> | null;
   }
 
   /** @private */
@@ -447,9 +451,7 @@ export class Account extends CoValueBase implements CoValue {
    *
    * @category Subscription & Loading
    */
-  waitForSync(options?: {
-    timeout?: number;
-  }) {
+  waitForSync(options?: { timeout?: number }) {
     return this._raw.core.waitForSync(options);
   }
 
@@ -458,9 +460,7 @@ export class Account extends CoValueBase implements CoValue {
    *
    * @category Subscription & Loading
    */
-  waitForAllCoValuesSync(options?: {
-    timeout?: number;
-  }) {
+  waitForAllCoValuesSync(options?: { timeout?: number }) {
     return this._raw.core.node.syncManager.waitForAllCoValuesSync(
       options?.timeout,
     );
@@ -502,7 +502,11 @@ export const AccountAndGroupProxyHandler: ProxyHandler<Account | Group> = {
       return true;
     } else if (key === "root") {
       if (value) {
-        target._raw.set("root", value.id as unknown as CoID<RawCoMap>);
+        target._raw.set(
+          "root",
+          value.id as unknown as CoID<RawCoMap>,
+          "trusting",
+        );
       }
       return true;
     } else {