jazz-tools 0.19.7 → 0.19.8

package/src/tools/coValues/coList.ts

@@ -11,7 +11,7 @@ import {
   Group,
   ID,
   AsLoaded,
-  MaybeLoaded,
+  Settled,
   unstable_mergeBranch,
   RefEncoded,
   RefsToResolve,
@@ -268,7 +268,7 @@ export class CoList<out Item = any>
       resolve?: RefsToResolveStrict<L, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<Resolved<L, R>>> {
+  ): Promise<Settled<Resolved<L, R>>> {
     return loadCoValueWithoutMe(this, id, options);
   }
 
@@ -380,7 +380,7 @@ export class CoList<out Item = any>
       owner: Account | Group;
       resolve?: RefsToResolveStrict<L, R>;
     },
-  ): Promise<MaybeLoaded<Resolved<L, R>>> {
+  ): Promise<Settled<Resolved<L, R>>> {
     const header = CoList._getUniqueHeader(
       options.unique,
       options.owner.$jazz.id,
@@ -420,7 +420,7 @@ export class CoList<out Item = any>
       resolve?: RefsToResolveStrict<L, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<Resolved<L, R>>> {
+  ): Promise<Settled<Resolved<L, R>>> {
     const header = CoList._getUniqueHeader(unique, ownerID);
 
     const owner = await Group.load(ownerID, {

package/src/tools/coValues/coMap.ts

@@ -18,7 +18,7 @@ import {
   getCoValueOwner,
   Group,
   ID,
-  MaybeLoaded,
+  Settled,
   PartialOnUndefined,
   RefEncoded,
   RefIfCoValue,
@@ -377,7 +377,7 @@ export class CoMap extends CoValueBase implements CoValue {
       loadAs?: Account | AnonymousJazzAgent;
       skipRetry?: boolean;
     },
-  ): Promise<MaybeLoaded<Resolved<M, R>>> {
+  ): Promise<Settled<Resolved<M, R>>> {
     return loadCoValueWithoutMe(this, id, options);
   }
 
@@ -494,7 +494,7 @@ export class CoMap extends CoValueBase implements CoValue {
       owner: Account | Group;
       resolve?: RefsToResolveStrict<M, R>;
     },
-  ): Promise<MaybeLoaded<Resolved<M, R>>> {
+  ): Promise<Settled<Resolved<M, R>>> {
     const header = CoMap._getUniqueHeader(
       options.unique,
       options.owner.$jazz.id,
@@ -536,7 +536,7 @@ export class CoMap extends CoValueBase implements CoValue {
       resolve?: RefsToResolveStrict<M, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<Resolved<M, R>>> {
+  ): Promise<Settled<Resolved<M, R>>> {
     const header = CoMap._getUniqueHeader(unique, ownerID);
 
     const owner = await Group.load(ownerID, {

package/src/tools/coValues/coPlainText.ts

@@ -7,7 +7,7 @@ import {
   CoValueJazzApi,
   CoValueLoadingState,
   ID,
-  MaybeLoaded,
+  Settled,
   Resolved,
   SubscribeListenerOptions,
   SubscribeRestArgs,
@@ -164,7 +164,7 @@ export class CoPlainText extends String implements CoValue {
     this: CoValueClass<T>,
     id: ID<T>,
     options?: { loadAs?: Account | AnonymousJazzAgent },
-  ): Promise<MaybeLoaded<T>> {
+  ): Promise<Settled<T>> {
     return loadCoValueWithoutMe(this, id, options);
   }
 

package/src/tools/coValues/coVector.ts

@@ -11,7 +11,7 @@ import {
   SubscribeListenerOptions,
   SubscribeRestArgs,
   TypeSym,
-  MaybeLoaded,
+  Settled,
   Account,
   CoValueJazzApi,
   inspect,
@@ -232,7 +232,7 @@ export class CoVector
     options?: {
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<C>> {
+  ): Promise<Settled<C>> {
     const coVector = await loadCoValueWithoutMe(this, id, options);
 
     /**

package/src/tools/coValues/deepLoading.ts

@@ -31,9 +31,16 @@ type IsUnion<T, U = T> = (
 // into the definition of CoValues.
 export type MaybeLoaded<T> = T | NotLoaded<T>;
 
+/**
+ * A CoValue that is either successfully loaded or that could not be loaded.
+ */
+export type Settled<T> = T | Inaccessible<T>;
+
 /**
  * A CoValue that is not loaded.
  */
+// Manually inlining the type to reduce type-checking complexity
+// type NotLoaded<T> = Loading<T> | Inaccessible<T>;
 export type NotLoaded<T> = {
   $jazz: {
     id: ID<T>;
@@ -45,6 +52,30 @@ export type NotLoaded<T> = {
   $isLoaded: false;
 };
 
+/**
+ * A CoValue that is being loaded
+ */
+export type Loading<T> = {
+  $jazz: {
+    id: ID<T>;
+    loadingState: typeof CoValueLoadingState.LOADING;
+  };
+  $isLoaded: false;
+};
+
+/**
+ * A CoValue that could not be loaded
+ */
+export type Inaccessible<T> = {
+  $jazz: {
+    id: ID<T>;
+    loadingState:
+      | typeof CoValueLoadingState.UNAVAILABLE
+      | typeof CoValueLoadingState.UNAUTHORIZED;
+  };
+  $isLoaded: false;
+};
+
 /**
  * Narrows a maybe-loaded, optional CoValue to a loaded and required CoValue.
  */

package/src/tools/coValues/group.ts

@@ -14,7 +14,7 @@ import {
   CoValue,
   CoValueClass,
   ID,
-  MaybeLoaded,
+  Settled,
   RefEncoded,
   RefsToResolve,
   RefsToResolveStrict,
@@ -283,7 +283,7 @@ export class Group extends CoValueBase implements CoValue {
       resolve?: RefsToResolveStrict<G, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<Resolved<G, R>>> {
+  ): Promise<Settled<Resolved<G, R>>> {
     return loadCoValueWithoutMe(this, id, options);
   }
 

package/src/tools/coValues/interfaces.ts

@@ -13,7 +13,9 @@ import {
   NotLoadedCoValueState,
   type Group,
   Loaded,
+  Inaccessible,
   MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   RegisteredSchemas,
@@ -145,7 +147,7 @@ export function loadCoValueWithoutMe<
     skipRetry?: boolean;
     unstable_branch?: BranchDefinition;
   },
-): Promise<MaybeLoaded<Resolved<V, R>>> {
+): Promise<Settled<Resolved<V, R>>> {
   return loadCoValue(cls, id, {
     ...options,
     loadAs: options?.loadAs ?? activeAccountContext.get(),
@@ -165,7 +167,7 @@ export function loadCoValue<
     skipRetry?: boolean;
     unstable_branch?: BranchDefinition;
   },
-): Promise<MaybeLoaded<Resolved<V, R>>> {
+): Promise<Settled<Resolved<V, R>>> {
   return new Promise((resolve) => {
     subscribeToCoValue<V, R>(
       cls,
@@ -302,8 +304,8 @@ export function subscribeToCoValue<
   options: {
     resolve?: RefsToResolveStrict<V, R>;
     loadAs: Account | AnonymousJazzAgent;
-    onUnavailable?: (value: NotLoaded<V>) => void;
-    onUnauthorized?: (value: NotLoaded<V>) => void;
+    onUnavailable?: (value: Inaccessible<V>) => void;
+    onUnauthorized?: (value: Inaccessible<V>) => void;
     syncResolution?: boolean;
     skipRetry?: boolean;
     unstable_branch?: BranchDefinition;
@@ -342,16 +344,10 @@ export function subscribeToCoValue<
 
     switch (value.$jazz.loadingState) {
       case CoValueLoadingState.UNAVAILABLE:
-        options.onUnavailable?.(value);
-
-        // Don't log unavailable errors when `loadUnique` or `upsertUnique` are used
-        if (!options.skipRetry) {
-          console.error(value.toString());
-        }
+        options.onUnavailable?.(value as Inaccessible<V>);
         break;
       case CoValueLoadingState.UNAUTHORIZED:
-        options.onUnauthorized?.(value);
-        console.error(value.toString());
+        options.onUnauthorized?.(value as Inaccessible<V>);
         break;
     }
   };
@@ -546,7 +542,7 @@ export async function internalLoadUnique<
     owner: Account | Group;
     resolve?: RefsToResolveStrict<V, R>;
   },
-): Promise<MaybeLoaded<Resolved<V, R>>> {
+): Promise<Settled<Resolved<V, R>>> {
   const loadAs = options.owner.$jazz.loadedAs;
 
   const node =
@@ -682,18 +678,18 @@ export async function exportCoValue<
   );
 
   const value = await new Promise<Loaded<S, R> | null>((resolve) => {
-    rootNode.setListener((value) => {
-      if (value.type === CoValueLoadingState.UNAVAILABLE) {
-        resolve(null);
-        console.error(value.toString());
-      } else if (value.type === CoValueLoadingState.UNAUTHORIZED) {
+    rootNode.setListener(() => {
+      const value = rootNode.getCurrentValue();
+
+      if (value.$isLoaded) {
+        resolve(value as Loaded<S, R>);
+      } else if (
+        value.$jazz.loadingState === CoValueLoadingState.UNAVAILABLE ||
+        value.$jazz.loadingState === CoValueLoadingState.UNAUTHORIZED
+      ) {
         resolve(null);
-        console.error(value.toString());
-      } else if (value.type === CoValueLoadingState.LOADED) {
-        resolve(value.value as Loaded<S, R>);
+        rootNode.destroy();
       }
-
-      rootNode.destroy();
     });
   });
 

package/src/tools/coValues/schemaUnion.ts

@@ -10,7 +10,7 @@ import {
   CoValueJazzApi,
   Group,
   ID,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -162,7 +162,7 @@ export abstract class SchemaUnion extends CoValueBase implements CoValue {
       loadAs?: Account | AnonymousJazzAgent;
       skipRetry?: boolean;
     },
-  ): Promise<MaybeLoaded<Resolved<M, R>>> {
+  ): Promise<Settled<Resolved<M, R>>> {
     return loadCoValueWithoutMe(this, id, options);
   }
 

package/src/tools/config.ts

@@ -0,0 +1,9 @@
+export {
+  setCustomErrorReporter,
+  enableCaptureErrorCause,
+} from "./subscribe/errorReporting.js";
+
+export {
+  logger,
+  LogLevel,
+} from "cojson";

package/src/tools/exports.ts

@@ -137,3 +137,7 @@ export {
 } from "./coValues/request.js";
 
 export * from "./ssr/index.js";
+
+export { captureStack } from "./subscribe/errorReporting.js";
+
+export * as jazzConfig from "./config.js";

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

@@ -5,7 +5,7 @@ import {
   CoMapSchemaDefinition,
   coOptionalDefiner,
   Group,
-  MaybeLoaded,
+  Settled,
   RefsToResolveStrict,
   RefsToResolve,
   Resolved,
@@ -84,7 +84,7 @@ export class AccountSchema<
       loadAs?: Account | AnonymousJazzAgent;
       resolve?: RefsToResolveStrict<AccountSchema<Shape>, R>;
     },
-  ): Promise<MaybeLoaded<Loaded<AccountSchema<Shape>, R>>> {
+  ): Promise<Settled<Loaded<AccountSchema<Shape>, R>>> {
     // @ts-expect-error
     return this.coValueClass.load(
       id,

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

@@ -5,7 +5,7 @@ import {
   BranchDefinition,
   InstanceOfSchema,
   InstanceOrPrimitiveOfSchemaCoValuesMaybeLoaded,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -87,7 +87,7 @@ export class CoDiscriminatedUnionSchema<
       unstable_branch?: BranchDefinition;
     },
   ): Promise<
-    MaybeLoaded<
+    Settled<
       Resolved<
         CoDiscriminatedUnionInstanceCoValuesMaybeLoaded<Options> & SchemaUnion,
         R

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

@@ -4,7 +4,7 @@ import {
   BranchDefinition,
   CoFeed,
   Group,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -69,7 +69,7 @@ export class CoFeedSchema<
       loadAs?: Account | AnonymousJazzAgent;
       unstable_branch?: BranchDefinition;
     },
-  ): Promise<MaybeLoaded<Resolved<CoFeedInstanceCoValuesMaybeLoaded<T>, R>>> {
+  ): Promise<Settled<Resolved<CoFeedInstanceCoValuesMaybeLoaded<T>, R>>> {
     // @ts-expect-error
     return this.coValueClass.load(
       id,

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

@@ -4,7 +4,7 @@ import {
   CoList,
   Group,
   ID,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -77,7 +77,7 @@ export class CoListSchema<
       loadAs?: Account | AnonymousJazzAgent;
       unstable_branch?: BranchDefinition;
     },
-  ): Promise<MaybeLoaded<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
+  ): Promise<Settled<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
     // @ts-expect-error
     return this.coValueClass.load(
       id,
@@ -147,7 +147,7 @@ export class CoListSchema<
     unique: CoValueUniqueness["uniqueness"];
     owner: Account | Group;
     resolve?: RefsToResolveStrict<CoListInstanceCoValuesMaybeLoaded<T>, R>;
-  }): Promise<MaybeLoaded<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
+  }): Promise<Settled<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
     // @ts-expect-error
     return this.coValueClass.upsertUnique(
       // @ts-expect-error
@@ -166,7 +166,7 @@ export class CoListSchema<
       resolve?: RefsToResolveStrict<CoListInstanceCoValuesMaybeLoaded<T>, R>;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<MaybeLoaded<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
+  ): Promise<Settled<Resolved<CoListInstanceCoValuesMaybeLoaded<T>, R>>> {
     // @ts-expect-error
     return this.coValueClass.loadUnique(
       unique,

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

@@ -6,7 +6,7 @@ import {
   DiscriminableCoValueSchemaDefinition,
   DiscriminableCoreCoValueSchema,
   Group,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -97,7 +97,7 @@ export class CoMapSchema<
       unstable_branch?: BranchDefinition;
     },
   ): Promise<
-    MaybeLoaded<
+    Settled<
       Resolved<Simplify<CoMapInstanceCoValuesMaybeLoaded<Shape>> & CoMap, R>
     >
   > {
@@ -183,7 +183,7 @@ export class CoMapSchema<
       R
     >;
   }): Promise<
-    MaybeLoaded<
+    Settled<
       Resolved<Simplify<CoMapInstanceCoValuesMaybeLoaded<Shape>> & CoMap, R>
     >
   > {
@@ -210,7 +210,7 @@ export class CoMapSchema<
       loadAs?: Account | AnonymousJazzAgent;
     },
   ): Promise<
-    MaybeLoaded<
+    Settled<
       Resolved<Simplify<CoMapInstanceCoValuesMaybeLoaded<Shape>> & CoMap, R>
     >
   > {

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

@@ -6,7 +6,7 @@ import {
   CoMapSchemaDefinition,
   Group,
   ID,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -64,9 +64,7 @@ export interface CoRecordSchema<
       loadAs?: Account | AnonymousJazzAgent;
       unstable_branch?: BranchDefinition;
     },
-  ): Promise<
-    MaybeLoaded<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>
-  >;
+  ): Promise<Settled<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>>;
 
   unstable_merge<
     const R extends RefsToResolve<
@@ -119,9 +117,7 @@ export interface CoRecordSchema<
     unique: CoValueUniqueness["uniqueness"];
     owner: Account | Group;
     resolve?: RefsToResolveStrict<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>;
-  }): Promise<
-    MaybeLoaded<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>
-  >;
+  }): Promise<Settled<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>>;
 
   loadUnique<
     const R extends RefsToResolve<
@@ -138,9 +134,7 @@ export interface CoRecordSchema<
       >;
       loadAs?: Account | AnonymousJazzAgent;
     },
-  ): Promise<
-    MaybeLoaded<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>
-  >;
+  ): Promise<Settled<Resolved<CoRecordInstanceCoValuesMaybeLoaded<K, V>, R>>>;
 
   getCoValueClass: () => typeof CoMap;
 

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

@@ -3,7 +3,7 @@ import {
   AnonymousJazzAgent,
   FileStream,
   Group,
-  MaybeLoaded,
+  Settled,
   coOptionalDefiner,
   unstable_mergeBranchWithResolve,
 } from "../../../internal.js";
@@ -82,7 +82,7 @@ export class FileStreamSchema implements CoreFileStreamSchema {
   load(
     id: string,
     options?: { loadAs?: Account | AnonymousJazzAgent },
-  ): Promise<MaybeLoaded<FileStream>> {
+  ): Promise<Settled<FileStream>> {
     return this.coValueClass.load(id, options);
   }
 

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

@@ -6,7 +6,7 @@ import {
 } from "../../../coValues/interfaces.js";
 import {
   Account,
-  MaybeLoaded,
+  Settled,
   RefsToResolve,
   RefsToResolveStrict,
   Resolved,
@@ -52,7 +52,7 @@ export class GroupSchema implements CoreGroupSchema {
       loadAs?: Account;
       resolve?: RefsToResolveStrict<Group, R>;
     },
-  ): Promise<MaybeLoaded<Group>> {
+  ): Promise<Settled<Group>> {
     return Group.load(id, options);
   }
   createInvite<G extends Group>(

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

@@ -4,7 +4,7 @@ import {
   BranchDefinition,
   CoPlainText,
   Group,
-  MaybeLoaded,
+  Settled,
   coOptionalDefiner,
   unstable_mergeBranchWithResolve,
 } from "../../../internal.js";
@@ -50,7 +50,7 @@ export class PlainTextSchema implements CorePlainTextSchema {
       loadAs: Account | AnonymousJazzAgent;
       unstable_branch?: BranchDefinition;
     },
-  ): Promise<MaybeLoaded<CoPlainText>> {
+  ): Promise<Settled<CoPlainText>> {
     return this.coValueClass.load(id, options);
   }
 

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

@@ -3,7 +3,7 @@ import {
   BranchDefinition,
   CoRichText,
   Group,
-  MaybeLoaded,
+  Settled,
   coOptionalDefiner,
   unstable_mergeBranchWithResolve,
 } from "../../../internal.js";
@@ -49,7 +49,7 @@ export class RichTextSchema implements CoreRichTextSchema {
       loadAs: Account | AnonymousJazzAgent;
       unstable_branch?: BranchDefinition;
     },
-  ): Promise<MaybeLoaded<CoRichText>> {
+  ): Promise<Settled<CoRichText>> {
     return this.coValueClass.load(id, options);
   }
 

package/src/tools/subscribe/JazzError.ts

@@ -11,21 +11,24 @@ export class JazzError {
   ) {}
 
   toString() {
-    return this.issues
+    // Build the main error message with inline stack info so it shows even if truncated
+    let result = this.issues
       .map((issue) => {
         let message = `${issue.message}`;
 
-        if (this.id) {
-          message += ` from ${this.id}`;
-        }
-
         if (issue.path.length > 0) {
-          message += ` on path ${issue.path.join(".")}`;
+          if (this.id) {
+            message += `. Subscription starts from ${this.id}`;
+          }
+
+          message += ` and the value is on path ${issue.path.join(".")}`;
         }
 
         return message;
       })
       .join("\n");
+
+    return result;
   }
 
   prependPath(item: string) {