jazz-tools 0.15.15 → 0.16.0

package/src/tools/implementation/zodSchema/schemaTypes/CoDiscriminatedUnionSchema.ts

@@ -1,34 +1,61 @@
 import {
   Account,
   AnonymousJazzAgent,
-  AnyCoSchema,
+  InstanceOfSchema,
   InstanceOrPrimitiveOfSchemaCoValuesNullable,
-  RefsToResolve,
-  RefsToResolveStrict,
   Resolved,
   SchemaUnion,
+  SchemaUnionConcreteSubclass,
   SubscribeListenerOptions,
+  coOptionalDefiner,
 } from "../../../internal.js";
 import { z } from "../zodReExport.js";
+import { CoOptionalSchema } from "./CoOptionalSchema.js";
+import { CoreCoValueSchema } from "./CoValueSchema.js";
 
-export type AnyDiscriminableCoSchema = AnyCoSchema &
-  z.core.$ZodTypeDiscriminable;
+export interface DiscriminableCoValueSchemaDefinition {
+  discriminatorMap: z.core.$ZodDiscriminatedUnionInternals["propValues"];
+}
+
+export interface DiscriminableCoreCoValueSchema extends CoreCoValueSchema {
+  getDefinition: () => DiscriminableCoValueSchemaDefinition;
+}
+
+export interface CoDiscriminatedUnionSchemaDefinition<
+  Options extends DiscriminableCoValueSchemas,
+> extends DiscriminableCoValueSchemaDefinition {
+  discriminator: string;
+  options: Options;
+}
+
+export type DiscriminableCoValueSchemas = [
+  DiscriminableCoreCoValueSchema,
+  ...DiscriminableCoreCoValueSchema[],
+];
+
+export interface CoreCoDiscriminatedUnionSchema<
+  Options extends DiscriminableCoValueSchemas = DiscriminableCoValueSchemas,
+> extends DiscriminableCoreCoValueSchema {
+  builtin: "CoDiscriminatedUnion";
+  getDefinition: () => CoDiscriminatedUnionSchemaDefinition<Options>;
+}
+export class CoDiscriminatedUnionSchema<
+  Options extends DiscriminableCoValueSchemas,
+> implements CoreCoDiscriminatedUnionSchema<Options>
+{
+  readonly collaborative = true as const;
+  readonly builtin = "CoDiscriminatedUnion" as const;
+  readonly getDefinition: () => CoDiscriminatedUnionSchemaDefinition<Options>;
 
-export type AnyCoDiscriminatedUnionSchema<
-  Types extends readonly [
-    AnyDiscriminableCoSchema,
-    ...AnyDiscriminableCoSchema[],
-  ],
-> = z.ZodDiscriminatedUnion<Types> & {
-  collaborative: true;
-};
+  constructor(
+    coreSchema: CoreCoDiscriminatedUnionSchema<Options>,
+    private coValueClass: SchemaUnionConcreteSubclass<
+      InstanceOfSchema<Options[number]>
+    >,
+  ) {
+    this.getDefinition = coreSchema.getDefinition;
+  }
 
-export type CoDiscriminatedUnionSchema<
-  Types extends readonly [
-    AnyDiscriminableCoSchema,
-    ...AnyDiscriminableCoSchema[],
-  ],
-> = AnyCoDiscriminatedUnionSchema<Types> & {
   load(
     id: string,
     options?: {
@@ -36,55 +63,77 @@ export type CoDiscriminatedUnionSchema<
       skipRetry?: boolean;
     },
   ): Promise<Resolved<
-    CoDiscriminatedUnionInstanceCoValuesNullable<Types> & SchemaUnion,
+    CoDiscriminatedUnionInstanceCoValuesNullable<Options> & SchemaUnion,
     true
-  > | null>;
+  > | null> {
+    return this.coValueClass.load(id, options) as any;
+  }
 
   subscribe(
     id: string,
     options: SubscribeListenerOptions<
-      CoDiscriminatedUnionInstanceCoValuesNullable<Types> & SchemaUnion,
+      CoDiscriminatedUnionInstanceCoValuesNullable<Options> & SchemaUnion,
       true
     >,
     listener: (
       value: Resolved<
-        CoDiscriminatedUnionInstanceCoValuesNullable<Types> & SchemaUnion,
+        CoDiscriminatedUnionInstanceCoValuesNullable<Options> & SchemaUnion,
         true
       >,
       unsubscribe: () => void,
     ) => void,
-  ): () => void;
+  ): () => void {
+    // @ts-expect-error
+    return this.coValueClass.subscribe(id, options, listener);
+  }
 
-  getCoValueClass: () => typeof SchemaUnion;
-};
+  getCoValueClass(): SchemaUnionConcreteSubclass<
+    InstanceOfSchema<Options[number]>
+  > {
+    return this.coValueClass;
+  }
+
+  optional(): CoOptionalSchema<this> {
+    return coOptionalDefiner(this);
+  }
+}
 
-export function enrichCoDiscriminatedUnionSchema<
-  Types extends readonly [
-    AnyDiscriminableCoSchema,
-    ...AnyDiscriminableCoSchema[],
-  ],
+export function createCoreCoDiscriminatedUnionSchema<
+  Options extends DiscriminableCoValueSchemas,
 >(
-  schema: z.ZodDiscriminatedUnion<Types>,
-  coValueClass: typeof SchemaUnion,
-): CoDiscriminatedUnionSchema<Types> {
-  return Object.assign(schema, {
-    load: (...args: [any, ...any]) => {
-      // @ts-expect-error
-      return coValueClass.load(...args);
-    },
-    subscribe: (...args: [any, ...any[]]) => {
-      // @ts-expect-error
-      return coValueClass.subscribe(...args);
-    },
-    getCoValueClass: () => {
-      return coValueClass;
-    },
-  }) as unknown as CoDiscriminatedUnionSchema<Types>;
+  discriminator: string,
+  schemas: Options,
+): CoreCoDiscriminatedUnionSchema<Options> {
+  return {
+    collaborative: true as const,
+    builtin: "CoDiscriminatedUnion" as const,
+    getDefinition: () => ({
+      discriminator,
+      get discriminatorMap() {
+        const propValues: DiscriminableCoValueSchemaDefinition["discriminatorMap"] =
+          {};
+        for (const option of schemas) {
+          const dm = option.getDefinition().discriminatorMap;
+          if (!dm || Object.keys(dm).length === 0)
+            throw new Error(
+              `Invalid discriminated union option at index "${schemas.indexOf(option)}"`,
+            );
+          for (const [k, v] of Object.entries(dm)) {
+            propValues[k] ??= new Set();
+            for (const val of v) {
+              propValues[k].add(val);
+            }
+          }
+        }
+        return propValues;
+      },
+      get options() {
+        return schemas;
+      },
+    }),
+  };
 }
 
 type CoDiscriminatedUnionInstanceCoValuesNullable<
-  Types extends readonly [
-    AnyDiscriminableCoSchema,
-    ...AnyDiscriminableCoSchema[],
-  ],
-> = NonNullable<InstanceOrPrimitiveOfSchemaCoValuesNullable<Types[number]>>;
+  Options extends DiscriminableCoValueSchemas,
+> = NonNullable<InstanceOrPrimitiveOfSchemaCoValuesNullable<Options[number]>>;

package/src/tools/implementation/zodSchema/schemaTypes/CoFeedSchema.ts

@@ -1,36 +1,43 @@
 import {
   Account,
+  AnyZodOrCoValueSchema,
   CoFeed,
   Group,
+  NotNull,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
+  Simplify,
   SubscribeListenerOptions,
+  coOptionalDefiner,
 } from "../../../internal.js";
 import { AnonymousJazzAgent } from "../../anonymousJazzAgent.js";
-import { InstanceOfSchema } from "../typeConverters/InstanceOfSchema.js";
 import { InstanceOrPrimitiveOfSchema } from "../typeConverters/InstanceOrPrimitiveOfSchema.js";
 import { InstanceOrPrimitiveOfSchemaCoValuesNullable } from "../typeConverters/InstanceOrPrimitiveOfSchemaCoValuesNullable.js";
-import { z } from "../zodReExport.js";
+import { CoOptionalSchema } from "./CoOptionalSchema.js";
+import { CoreCoValueSchema } from "./CoValueSchema.js";
 
-type CoFeedInit<T extends z.core.$ZodType> = Array<
-  T extends z.core.$ZodOptional<any>
-    ? InstanceOrPrimitiveOfSchemaCoValuesNullable<T>
-    : NonNullable<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>
+type CoFeedInit<T extends AnyZodOrCoValueSchema> = Simplify<
+  Array<NotNull<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>>
 >;
 
-export type CoFeedSchema<T extends z.core.$ZodType> = z.core.$ZodCustom<
-  CoFeed<InstanceOfSchema<T>>,
-  unknown
-> & {
-  collaborative: true;
-  builtin: "CoFeed";
-  element: T;
+export class CoFeedSchema<T extends AnyZodOrCoValueSchema>
+  implements CoreCoFeedSchema<T>
+{
+  collaborative = true as const;
+  builtin = "CoFeed" as const;
+
+  constructor(
+    public element: T,
+    private coValueClass: typeof CoFeed,
+  ) {}
 
   create(
     init: CoFeedInit<T>,
     options?: { owner: Account | Group } | Account | Group,
-  ): CoFeedInstance<T>;
+  ): CoFeedInstance<T> {
+    return this.coValueClass.create(init, options) as CoFeedInstance<T>;
+  }
 
   load<const R extends RefsToResolve<CoFeedInstanceCoValuesNullable<T>> = true>(
     id: string,
@@ -38,7 +45,10 @@ export type CoFeedSchema<T extends z.core.$ZodType> = z.core.$ZodCustom<
       resolve?: RefsToResolveStrict<CoFeedInstanceCoValuesNullable<T>, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<Resolved<CoFeedInstanceCoValuesNullable<T>, R> | null>;
+  ): Promise<Resolved<CoFeedInstanceCoValuesNullable<T>, R> | null> {
+    // @ts-expect-error
+    return this.coValueClass.load(id, options);
+  }
 
   subscribe(
     id: string,
@@ -57,47 +67,41 @@ export type CoFeedSchema<T extends z.core.$ZodType> = z.core.$ZodCustom<
       unsubscribe: () => void,
     ) => void,
   ): () => void;
+  subscribe(...args: [any, ...any[]]) {
+    // @ts-expect-error
+    return this.coValueClass.subscribe(...args);
+  }
 
-  getCoValueClass: () => typeof CoFeed;
-};
+  getCoValueClass(): typeof CoFeed {
+    return this.coValueClass;
+  }
 
-export function enrichCoFeedSchema<T extends z.core.$ZodType>(
-  schema: AnyCoFeedSchema<T>,
-  coValueClass: typeof CoFeed,
-): CoFeedSchema<T> {
-  return Object.assign(schema, {
-    create: (...args: [any, ...any[]]) => {
-      return coValueClass.create(...args);
-    },
-    load: (...args: [any, ...any[]]) => {
-      // @ts-expect-error
-      return coValueClass.load(...args);
-    },
-    subscribe: (...args: [any, ...any[]]) => {
-      // @ts-expect-error
-      return coValueClass.subscribe(...args);
-    },
-    withHelpers: (helpers: (Self: z.core.$ZodType) => object) => {
-      return Object.assign(schema, helpers(schema));
-    },
-    getCoValueClass: () => {
-      return coValueClass;
-    },
-  }) as unknown as CoFeedSchema<T>;
+  optional(): CoOptionalSchema<this> {
+    return coOptionalDefiner(this);
+  }
 }
 
-// less precise version to avoid circularity issues and allow matching against
-export type AnyCoFeedSchema<T extends z.core.$ZodType = z.core.$ZodType> =
-  z.core.$ZodCustom<any, unknown> & {
-    collaborative: true;
-    builtin: "CoFeed";
-    element: T;
+export function createCoreCoFeedSchema<T extends AnyZodOrCoValueSchema>(
+  element: T,
+): CoreCoFeedSchema<T> {
+  return {
+    collaborative: true as const,
+    builtin: "CoFeed" as const,
+    element,
   };
+}
+
+// less precise version to avoid circularity issues and allow matching against
+export interface CoreCoFeedSchema<
+  T extends AnyZodOrCoValueSchema = AnyZodOrCoValueSchema,
+> extends CoreCoValueSchema {
+  builtin: "CoFeed";
+  element: T;
+}
 
-export type CoFeedInstance<T extends z.core.$ZodType> = CoFeed<
+export type CoFeedInstance<T extends AnyZodOrCoValueSchema> = CoFeed<
   InstanceOrPrimitiveOfSchema<T>
 >;
 
-export type CoFeedInstanceCoValuesNullable<T extends z.core.$ZodType> = CoFeed<
-  InstanceOrPrimitiveOfSchemaCoValuesNullable<T>
->;
+export type CoFeedInstanceCoValuesNullable<T extends AnyZodOrCoValueSchema> =
+  CoFeed<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>;

package/src/tools/implementation/zodSchema/schemaTypes/CoListSchema.ts

@@ -2,28 +2,42 @@ import {
   Account,
   CoList,
   Group,
+  NotNull,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
+  Simplify,
   SubscribeListenerOptions,
+  coOptionalDefiner,
 } from "../../../internal.js";
 import { AnonymousJazzAgent } from "../../anonymousJazzAgent.js";
 import { InstanceOrPrimitiveOfSchema } from "../typeConverters/InstanceOrPrimitiveOfSchema.js";
 import { InstanceOrPrimitiveOfSchemaCoValuesNullable } from "../typeConverters/InstanceOrPrimitiveOfSchemaCoValuesNullable.js";
-import { z } from "../zodReExport.js";
-import { WithHelpers } from "../zodSchema.js";
+import { AnyZodOrCoValueSchema } from "../zodSchema.js";
+import { CoOptionalSchema } from "./CoOptionalSchema.js";
+import { CoreCoValueSchema } from "./CoValueSchema.js";
 
-type CoListInit<T extends z.core.$ZodType> = Array<
-  T extends z.core.$ZodOptional<any>
-    ? InstanceOrPrimitiveOfSchemaCoValuesNullable<T>
-    : NonNullable<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>
+type CoListInit<T extends AnyZodOrCoValueSchema> = Simplify<
+  Array<NotNull<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>>
 >;
 
-export type CoListSchema<T extends z.core.$ZodType> = AnyCoListSchema<T> & {
-  create: (
+export class CoListSchema<T extends AnyZodOrCoValueSchema>
+  implements CoreCoListSchema<T>
+{
+  collaborative = true as const;
+  builtin = "CoList" as const;
+
+  constructor(
+    public element: T,
+    private coValueClass: typeof CoList,
+  ) {}
+
+  create(
     items: CoListInit<T>,
     options?: { owner: Account | Group } | Account | Group,
-  ) => CoList<InstanceOrPrimitiveOfSchema<T>>;
+  ): CoListInstance<T> {
+    return this.coValueClass.create(items, options) as CoListInstance<T>;
+  }
 
   load<const R extends RefsToResolve<CoListInstanceCoValuesNullable<T>> = true>(
     id: string,
@@ -31,7 +45,10 @@ export type CoListSchema<T extends z.core.$ZodType> = AnyCoListSchema<T> & {
       resolve?: RefsToResolveStrict<CoListInstanceCoValuesNullable<T>, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<Resolved<CoListInstanceCoValuesNullable<T>, R> | null>;
+  ): Promise<Resolved<CoListInstanceCoValuesNullable<T>, R> | null> {
+    // @ts-expect-error
+    return this.coValueClass.load(id, options);
+  }
 
   subscribe<
     const R extends RefsToResolve<CoListInstanceCoValuesNullable<T>> = true,
@@ -42,49 +59,40 @@ export type CoListSchema<T extends z.core.$ZodType> = AnyCoListSchema<T> & {
       value: Resolved<CoListInstanceCoValuesNullable<T>, R>,
       unsubscribe: () => void,
     ) => void,
-  ): () => void;
+  ): () => void {
+    return this.coValueClass.subscribe(id, options, listener);
+  }
 
-  /** @deprecated Define your helper methods separately, in standalone functions. */
-  withHelpers<S extends z.core.$ZodType, T extends object>(
-    this: S,
-    helpers: (Self: S) => T,
-  ): WithHelpers<S, T>;
+  getCoValueClass(): typeof CoList {
+    return this.coValueClass;
+  }
 
-  getCoValueClass: () => typeof CoList;
-};
+  optional(): CoOptionalSchema<this> {
+    return coOptionalDefiner(this);
+  }
+}
 
-export function enrichCoListSchema<T extends z.core.$ZodType>(
-  schema: AnyCoListSchema<T>,
-  coValueClass: typeof CoList,
-): CoListSchema<T> {
-  return Object.assign(schema, {
-    create: (...args: [any, ...any[]]) => {
-      return coValueClass.create(...args);
-    },
-    load: (...args: [any, ...any[]]) => {
-      return coValueClass.load(...args);
-    },
-    subscribe: (...args: [any, ...any[]]) => {
-      // @ts-expect-error
-      return coValueClass.subscribe(...args);
-    },
-    withHelpers: (helpers: (Self: z.core.$ZodType) => object) => {
-      return Object.assign(schema, helpers(schema));
-    },
-    getCoValueClass: () => {
-      return coValueClass;
-    },
-  }) as unknown as CoListSchema<T>;
+export function createCoreCoListSchema<T extends AnyZodOrCoValueSchema>(
+  element: T,
+): CoreCoListSchema<T> {
+  return {
+    collaborative: true as const,
+    builtin: "CoList" as const,
+    element,
+  };
 }
 
 // less precise version to avoid circularity issues and allow matching against
-export type AnyCoListSchema<T extends z.core.$ZodType = z.core.$ZodType> =
-  z.core.$ZodArray<T> & { collaborative: true };
+export interface CoreCoListSchema<
+  T extends AnyZodOrCoValueSchema = AnyZodOrCoValueSchema,
+> extends CoreCoValueSchema {
+  builtin: "CoList";
+  element: T;
+}
 
-export type CoListInstance<T extends z.core.$ZodType> = CoList<
+export type CoListInstance<T extends AnyZodOrCoValueSchema> = CoList<
   InstanceOrPrimitiveOfSchema<T>
 >;
 
-export type CoListInstanceCoValuesNullable<T extends z.core.$ZodType> = CoList<
-  InstanceOrPrimitiveOfSchemaCoValuesNullable<T>
->;
+export type CoListInstanceCoValuesNullable<T extends AnyZodOrCoValueSchema> =
+  CoList<InstanceOrPrimitiveOfSchemaCoValuesNullable<T>>;