jazz-tools 0.18.11 → 0.18.13

package/dist/{chunk-RQHJFPIB.js → chunk-AEXYCCQS.js}

@@ -145,6 +145,13 @@ var CoValueJazzApi = class {
       enumerable: false
     });
   }
+  get id() {
+    const sourceId = this.raw.core.getCurrentBranchSourceId();
+    if (sourceId) {
+      return sourceId;
+    }
+    return this.raw.id;
+  }
   /** @internal */
   get localNode() {
     return this.raw.core.node;
@@ -188,6 +195,29 @@ var CoValueJazzApi = class {
     }
     return value;
   }
+  /**
+   * The name of the active branch of the CoValue
+   */
+  get branchName() {
+    const subscriptionScope = this._subscriptionScope;
+    return subscriptionScope?.unstable_branch?.name;
+  }
+  get isBranched() {
+    const subscriptionScope = this._subscriptionScope;
+    return Boolean(subscriptionScope?.unstable_branch);
+  }
+  /**
+   * Deeply merge the current branch into the main CoValues.
+   *
+   * Doesn't have any effect when there are no changes to merge, or the current CoValue is not a branch
+   */
+  unstable_merge() {
+    const subscriptionScope = this._subscriptionScope;
+    if (!subscriptionScope) {
+      return;
+    }
+    unstable_mergeBranch(subscriptionScope);
+  }
 };
 
 // src/tools/implementation/inspect.ts
@@ -494,13 +524,6 @@ var CoMapJazzApi = class extends CoValueJazzApi {
     this.coMap = coMap;
     this.getRaw = getRaw;
   }
-  /**
-   * The ID of this `CoMap`
-   * @category Content
-   */
-  get id() {
-    return this.raw.id;
-  }
   get owner() {
     return getCoValueOwner(this.coMap);
   }
@@ -1132,13 +1155,6 @@ var CoListJazzApi = class extends CoValueJazzApi {
     this.coList = coList;
     this.getRaw = getRaw;
   }
-  /**
-   * The ID of this `CoList`
-   * @category Content
-   */
-  get id() {
-    return this.raw.id;
-  }
   /** @category Collaboration */
   get owner() {
     return getCoValueOwner(this.coList);
@@ -1647,13 +1663,6 @@ var CoFeedJazzApi = class extends CoValueJazzApi {
     this.coFeed = coFeed;
     this.raw = raw;
   }
-  /**
-   * The ID of this `CoFeed`
-   * @category Content
-   */
-  get id() {
-    return this.raw.id;
-  }
   get owner() {
     return getCoValueOwner(this.coFeed);
   }
@@ -2094,13 +2103,6 @@ var FileStreamJazzApi = class extends CoValueJazzApi {
     this.fileStream = fileStream;
     this.raw = raw;
   }
-  /**
-   * The ID of this `FileStream`
-   * @category Content
-   */
-  get id() {
-    return this.raw.id;
-  }
   get owner() {
     return getCoValueOwner(this.fileStream);
   }
@@ -2325,13 +2327,6 @@ var AccountJazzApi = class extends CoValueJazzApi {
       this.sessionID = this.localNode.currentSessionID;
     }
   }
-  /**
-   * The ID of this `Account`
-   * @category Content
-   */
-  get id() {
-    return this.raw.id;
-  }
   /**
    * Accounts have no owner. They can be accessed by everyone.
    */
@@ -2486,6 +2481,9 @@ function isControlledAccount(account) {
 RegisteredSchemas["Account"] = Account;
 
 // src/tools/coValues/group.ts
+import {
+  RawAccount as RawAccount2
+} from "cojson";
 var _Group = class _Group extends CoValueBase {
   /** @deprecated Don't use constructor directly, use .create */
   constructor(options) {
@@ -2522,7 +2520,7 @@ var _Group = class _Group extends CoValueBase {
     return this.$jazz.raw.myRole();
   }
   addMember(member, role) {
-    if (member !== "everyone" && member[TypeSym] === "Group") {
+    if (isGroupValue(member)) {
       if (role === "writeOnly")
         throw new Error("Cannot add group as member with write-only role");
       this.$jazz.raw.extend(member.$jazz.raw, role);
@@ -2534,7 +2532,7 @@ var _Group = class _Group extends CoValueBase {
     }
   }
   removeMember(member) {
-    if (member !== "everyone" && member[TypeSym] === "Group") {
+    if (isGroupValue(member)) {
       this.$jazz.raw.revokeExtend(member.$jazz.raw);
     } else {
       return this.$jazz.raw.removeMember(
@@ -2632,7 +2630,10 @@ var _Group = class _Group extends CoValueBase {
     await this.$jazz.raw.revokeExtend(parent.$jazz.raw);
     return this;
   }
-  /** @category Subscription & Loading */
+  /** @category Subscription & Loading
+   *
+   * @deprecated Use `co.group(...).load` instead.
+   */
   static load(id, options) {
     return loadCoValueWithoutMe(this, id, options);
   }
@@ -2693,6 +2694,9 @@ function getCoValueOwner(coValue) {
   }
   return group;
 }
+function isGroupValue(value) {
+  return value !== "everyone" && !(value.$jazz.raw instanceof RawAccount2);
+}
 
 // src/tools/coValues/profile.ts
 var Profile = class extends CoMap {
@@ -2721,7 +2725,7 @@ var Profile = class extends CoMap {
 
 // src/tools/coValues/inbox.ts
 import {
-  RawAccount as RawAccount2
+  RawAccount as RawAccount3
 } from "cojson";
 
 // src/tools/lib/id.ts
@@ -2765,7 +2769,7 @@ var IncrementalFeed = class {
 };
 async function createInboxMessage(payload, inboxOwner) {
   const group = payload.$jazz.raw.group;
-  if (group instanceof RawAccount2) {
+  if (group instanceof RawAccount3) {
     throw new Error("Inbox messages should be owned by a group");
   }
   group.addMember(inboxOwner, "writer");
@@ -3143,9 +3147,6 @@ var CoTextJazzApi = class extends CoValueJazzApi {
     this.coText = coText;
     this.raw = raw;
   }
-  get id() {
-    return this.raw.id;
-  }
   get owner() {
     return getCoValueOwner(this.coText);
   }
@@ -3506,6 +3507,9 @@ function applyCoValueMigrations(instance) {
 }
 
 // src/tools/subscribe/CoValueCoreSubscription.ts
+import {
+  cojsonInternals as cojsonInternals5
+} from "cojson";
 var CoValueCoreSubscription = class {
   constructor(localNode, id, listener, skipRetry, branch) {
     this._unsubscribe = () => {
@@ -3526,7 +3530,7 @@ var CoValueCoreSubscription = class {
   initializeSubscription() {
     const source = this.source;
     if (source.isAvailable()) {
-      this.handleAvailableSource(source);
+      this.handleAvailableSource();
       return;
     }
     if (this.branchName) {
@@ -3539,15 +3543,18 @@ var CoValueCoreSubscription = class {
    * Handles the case where the CoValue source is immediately available.
    * Either subscribes directly or attempts to get the requested branch.
    */
-  handleAvailableSource(source) {
-    if (!this.branchName) {
-      this.subscribe(source.getCurrentContent());
+  handleAvailableSource() {
+    if (!this.branchName || !cojsonInternals5.canBeBranched(this.source)) {
+      this.subscribe(this.source.getCurrentContent());
       return;
     }
-    const branch = source.getBranch(this.branchName, this.branchOwnerId);
+    const branch = this.source.getBranch(this.branchName, this.branchOwnerId);
     if (branch.isAvailable()) {
       this.subscribe(branch.getCurrentContent());
       return;
+    } else if (!this.source.hasBranch(this.branchName, this.branchOwnerId)) {
+      this.source.createBranch(this.branchName, this.branchOwnerId);
+      this.subscribe(branch.getCurrentContent());
     } else {
       this.handleBranchCheckout();
     }
@@ -3677,7 +3684,7 @@ var JazzError = class _JazzError {
 };
 
 // src/tools/subscribe/utils.ts
-import { RawAccount as RawAccount3 } from "cojson";
+import { RawAccount as RawAccount4 } from "cojson";
 
 // src/tools/lib/cache.ts
 var weakMap = /* @__PURE__ */ new WeakMap();
@@ -3698,7 +3705,7 @@ function myRoleForRawValue(raw) {
   const rawOwner = raw.group;
   const owner = coValuesCache.get(
     rawOwner,
-    () => rawOwner instanceof RawAccount3 ? RegisteredSchemas["Account"].fromRaw(rawOwner) : RegisteredSchemas["Group"].fromRaw(rawOwner)
+    () => rawOwner instanceof RawAccount4 ? RegisteredSchemas["Account"].fromRaw(rawOwner) : RegisteredSchemas["Group"].fromRaw(rawOwner)
   );
   return accountOrGroupToGroup(owner).myRole();
 }
@@ -3719,12 +3726,13 @@ function createCoValue(ref2, raw, subscriptionScope) {
 
 // src/tools/subscribe/SubscriptionScope.ts
 var SubscriptionScope = class _SubscriptionScope {
-  constructor(node, resolve, id, schema, skipRetry = false, bestEffortResolution = false) {
+  constructor(node, resolve, id, schema, skipRetry = false, bestEffortResolution = false, unstable_branch) {
     this.node = node;
     this.id = id;
     this.schema = schema;
     this.skipRetry = skipRetry;
     this.bestEffortResolution = bestEffortResolution;
+    this.unstable_branch = unstable_branch;
     this.childNodes = /* @__PURE__ */ new Map();
     this.childValues = /* @__PURE__ */ new Map();
     this.childErrors = /* @__PURE__ */ new Map();
@@ -3787,7 +3795,8 @@ var SubscriptionScope = class _SubscriptionScope {
         }
         this.handleUpdate(value);
       },
-      skipRetry
+      skipRetry,
+      this.unstable_branch
     );
   }
   updateValue(value) {
@@ -3989,7 +3998,8 @@ var SubscriptionScope = class _SubscriptionScope {
       id,
       descriptor,
       this.skipRetry,
-      this.bestEffortResolution
+      this.bestEffortResolution,
+      this.unstable_branch
     );
     this.childNodes.set(id, child);
     child.setListener((value) => this.handleChildUpdate(id, value));
@@ -4170,7 +4180,8 @@ var SubscriptionScope = class _SubscriptionScope {
       id,
       descriptor,
       this.skipRetry,
-      this.bestEffortResolution
+      this.bestEffortResolution,
+      this.unstable_branch
     );
     this.childNodes.set(id, child);
     child.setListener((value) => this.handleChildUpdate(id, value, key));
@@ -4228,7 +4239,7 @@ function accessChildById(parent, childId, schema) {
 
 // src/tools/implementation/createContext.ts
 import {
-  LocalNode as LocalNode3
+  LocalNode as LocalNode4
 } from "cojson";
 async function randomSessionProvider(accountID, crypto) {
   return {
@@ -4253,7 +4264,7 @@ async function createJazzContextFromExistingCredentials({
   );
   const CurrentAccountSchema = PropsAccountSchema ?? RegisteredSchemas["Account"];
   const AccountClass = coValueClassFromCoValueClassOrSchema(CurrentAccountSchema);
-  const node = await LocalNode3.withLoadedAccount({
+  const node = await LocalNode4.withLoadedAccount({
     accountID: credentials.accountID,
     accountSecret: credentials.secret,
     sessionID,
@@ -4297,7 +4308,7 @@ async function createJazzContextForNewAccount({
 }) {
   const CurrentAccountSchema = PropsAccountSchema ?? RegisteredSchemas["Account"];
   const AccountClass = coValueClassFromCoValueClassOrSchema(CurrentAccountSchema);
-  const { node } = await LocalNode3.withNewlyCreatedAccount({
+  const { node } = await LocalNode4.withNewlyCreatedAccount({
     creationProps,
     peersToLoadFrom,
     crypto,
@@ -4382,7 +4393,7 @@ function createAnonymousJazzContext({
   storage
 }) {
   const agentSecret = crypto.newRandomAgentSecret();
-  const node = new LocalNode3(
+  const node = new LocalNode4(
     agentSecret,
     crypto.newRandomSessionID(crypto.getAgentID(agentSecret)),
     crypto
@@ -4491,6 +4502,9 @@ var RichTextSchema = class {
   subscribe(...args) {
     return this.coValueClass.subscribe(...args);
   }
+  unstable_merge(id, options) {
+    return unstable_mergeBranchWithResolve2(this.coValueClass, id, options);
+  }
   getCoValueClass() {
     return this.coValueClass;
   }
@@ -4499,6 +4513,35 @@ var RichTextSchema = class {
   }
 };
 
+// src/tools/implementation/zodSchema/schemaTypes/GroupSchema.ts
+function createCoreGroupSchema() {
+  return {
+    collaborative: true,
+    builtin: "Group"
+  };
+}
+var GroupSchema = class {
+  constructor() {
+    this.collaborative = true;
+    this.builtin = "Group";
+  }
+  getCoValueClass() {
+    return Group6;
+  }
+  optional() {
+    return coOptionalDefiner(this);
+  }
+  create(options) {
+    return Group6.create(options);
+  }
+  load(id, options) {
+    return Group6.load(id, options);
+  }
+  subscribe(id, ...args) {
+    return Group6.subscribe(id, ...args);
+  }
+};
+
 // src/tools/implementation/zodSchema/zodCo.ts
 var isZodV4Schema = (schema) => {
   return typeof schema === "object" && schema !== null && "_zod" in schema;
@@ -4535,6 +4578,10 @@ var coAccountDefiner = (shape = {
   const coreSchema = createCoreAccountSchema(shape);
   return hydrateCoreCoValueSchema(coreSchema);
 };
+var coGroupDefiner = () => {
+  const coreSchema = createCoreGroupSchema();
+  return hydrateCoreCoValueSchema(coreSchema);
+};
 var coRecordDefiner = (_keyType, valueType) => {
   return coMapDefiner({}).catchall(valueType);
 };
@@ -4598,6 +4645,7 @@ __export(coExport_exports, {
   DiscriminatedUnion: () => CoDiscriminatedUnionSchema,
   Feed: () => CoFeedSchema,
   FileStream: () => FileStreamSchema,
+  Group: () => GroupSchema,
   List: () => CoListSchema,
   Optional: () => CoOptionalSchema,
   PlainText: () => PlainTextSchema,
@@ -4606,6 +4654,7 @@ __export(coExport_exports, {
   discriminatedUnion: () => coDiscriminatedUnionDefiner,
   feed: () => coFeedDefiner,
   fileStream: () => coFileStreamDefiner,
+  group: () => coGroupDefiner,
   image: () => coImageDefiner,
   list: () => coListDefiner,
   map: () => coMapDefiner,
@@ -4667,6 +4716,9 @@ function enrichCoMapSchema(schema, coValueClass) {
     loadUnique: (...args) => {
       return coValueClass.loadUnique(...args);
     },
+    unstable_merge: (...args) => {
+      return unstable_mergeBranchWithResolve2(coValueClass, ...args);
+    },
     catchall: (catchAll) => {
       const schemaWithCatchAll = createCoreCoMapSchema(
         coValueSchema.getDefinition().shape,
@@ -4733,6 +4785,9 @@ var CoListSchema = class {
   load(id, options) {
     return this.coValueClass.load(id, options);
   }
+  unstable_merge(id, options) {
+    return unstable_mergeBranchWithResolve2(this.coValueClass, id, options);
+  }
   subscribe(id, options, listener) {
     return this.coValueClass.subscribe(id, options, listener);
   }
@@ -4775,6 +4830,9 @@ var CoFeedSchema = class {
   load(id, options) {
     return this.coValueClass.load(id, options);
   }
+  unstable_merge(id, options) {
+    return unstable_mergeBranchWithResolve2(this.coValueClass, id, options);
+  }
   subscribe(...args) {
     return this.coValueClass.subscribe(...args);
   }
@@ -4815,6 +4873,9 @@ var PlainTextSchema = class {
   subscribe(...args) {
     return this.coValueClass.subscribe(...args);
   }
+  unstable_merge(id, options) {
+    return unstable_mergeBranchWithResolve2(this.coValueClass, id, options);
+  }
   fromRaw(raw) {
     return this.coValueClass.fromRaw(raw);
   }
@@ -4854,6 +4915,9 @@ var FileStreamSchema = class {
   load(id, options) {
     return this.coValueClass.load(id, options);
   }
+  unstable_merge(id, options) {
+    return unstable_mergeBranchWithResolve2(this.coValueClass, id, options);
+  }
   subscribe(...args) {
     return this.coValueClass.subscribe(...args);
   }
@@ -4892,6 +4956,9 @@ function enrichAccountSchema(schema, coValueClass) {
     fromRaw: (...args) => {
       return coValueClass.fromRaw(...args);
     },
+    unstable_merge: (...args) => {
+      return unstable_mergeBranchWithResolve(coValueClass, ...args);
+    },
     withMigration: (migration) => {
       coValueClass.prototype.migrate = async function(creationProps) {
         await migration(this, creationProps);
@@ -5151,6 +5218,8 @@ function hydrateCoreCoValueSchema(schema) {
     const coValueClass = SchemaUnion.Of(schemaUnionDiscriminatorFor(schema));
     const coValueSchema = new CoDiscriminatedUnionSchema(schema, coValueClass);
     return coValueSchema;
+  } else if (schema.builtin === "Group") {
+    return new GroupSchema();
   } else {
     const notReachable = schema;
     throw new Error(
@@ -5177,7 +5246,7 @@ var ImageDefinitionBase = coMapDefiner({
 var ImageDefinition = ImageDefinitionBase;
 
 // src/tools/implementation/ContextManager.ts
-import { cojsonInternals as cojsonInternals5 } from "cojson";
+import { cojsonInternals as cojsonInternals6 } from "cojson";
 import { PureJSCrypto } from "cojson/dist/crypto/PureJSCrypto";
 
 // src/tools/auth/KvStoreContext.ts
@@ -5537,7 +5606,7 @@ var JazzContextManager = class {
     }
     const currentContext = this.context;
     if (prevContext && currentContext && "me" in prevContext && "me" in currentContext) {
-      const [prevAccountAsPeer, currentAccountAsPeer] = cojsonInternals5.connectedPeers(
+      const [prevAccountAsPeer, currentAccountAsPeer] = cojsonInternals6.connectedPeers(
         prevContext.me.$jazz.id,
         currentContext.me.$jazz.id,
         {
@@ -5657,7 +5726,8 @@ function isCoValueClass(value) {
 function loadCoValueWithoutMe(cls, id, options) {
   return loadCoValue(cls, id, {
     ...options,
-    loadAs: options?.loadAs ?? activeAccountContext.get()
+    loadAs: options?.loadAs ?? activeAccountContext.get(),
+    unstable_branch: options?.unstable_branch
   });
 }
 function loadCoValue(cls, id, options) {
@@ -5675,7 +5745,8 @@ function loadCoValue(cls, id, options) {
         },
         onUnauthorized: () => {
           resolve(null);
-        }
+        },
+        unstable_branch: options.unstable_branch
       },
       (value, unsubscribe) => {
         resolve(value);
@@ -5690,7 +5761,8 @@ async function ensureCoValueLoaded(existing, options) {
     existing.$jazz.id,
     {
       loadAs: existing.$jazz.loadedAs,
-      resolve: options?.resolve
+      resolve: options?.resolve,
+      unstable_branch: options?.unstable_branch
     }
   );
   if (!response) {
@@ -5706,7 +5778,8 @@ function parseSubscribeRestArgs(args) {
           resolve: args[0].resolve,
           loadAs: args[0].loadAs,
           onUnauthorized: args[0].onUnauthorized,
-          onUnavailable: args[0].onUnavailable
+          onUnavailable: args[0].onUnavailable,
+          unstable_branch: args[0].unstable_branch
         },
         listener: args[1]
       };
@@ -5745,7 +5818,9 @@ function subscribeToCoValue(cls, id, options, listener) {
       ref: cls,
       optional: false
     },
-    options.skipRetry
+    options.skipRetry,
+    false,
+    options.unstable_branch
   );
   const handleUpdate = (value) => {
     if (unsubscribed) return;
@@ -5784,7 +5859,8 @@ function subscribeToExistingCoValue(existing, options, listener) {
       loadAs: existing.$jazz.loadedAs,
       resolve: options?.resolve,
       onUnavailable: options?.onUnavailable,
-      onUnauthorized: options?.onUnauthorized
+      onUnauthorized: options?.onUnauthorized,
+      unstable_branch: options?.unstable_branch
     },
     listener
   );
@@ -5796,9 +5872,9 @@ function isAccountInstance(instance) {
   return TypeSym in instance && instance[TypeSym] === "Account";
 }
 function parseCoValueCreateOptions(options) {
-  const Group16 = RegisteredSchemas["Group"];
+  const Group17 = RegisteredSchemas["Group"];
   if (!options) {
-    return { owner: Group16.create(), uniqueness: void 0 };
+    return { owner: Group17.create(), uniqueness: void 0 };
   }
   if (TypeSym in options) {
     if (options[TypeSym] === "Account") {
@@ -5809,7 +5885,7 @@ function parseCoValueCreateOptions(options) {
   }
   const uniqueness = options.unique ? { uniqueness: options.unique } : void 0;
   const opts = {
-    owner: options.owner ? accountOrGroupToGroup(options.owner) : Group16.create(),
+    owner: options.owner ? accountOrGroupToGroup(options.owner) : Group17.create(),
     uniqueness
   };
   return opts;
@@ -5839,7 +5915,8 @@ async function exportCoValue(cls, id, options) {
       optional: false
     },
     options.skipRetry,
-    options.bestEffortResolution
+    options.bestEffortResolution,
+    options.unstable_branch
   );
   const value = await new Promise((resolve2) => {
     rootNode.setListener((value2) => {
@@ -5899,6 +5976,50 @@ function importContentPieces(contentPieces, loadAs) {
     node.syncManager.handleNewContent(piece, "import");
   }
 }
+function unstable_mergeBranch(subscriptionScope) {
+  if (!subscriptionScope.unstable_branch) {
+    return;
+  }
+  function handleMerge(subscriptionNode) {
+    if (subscriptionNode.value.type === "loaded") {
+      subscriptionNode.value.value.$jazz.raw.core.mergeBranch();
+    }
+    for (const childNode of subscriptionNode.childNodes.values()) {
+      handleMerge(childNode);
+    }
+  }
+  handleMerge(subscriptionScope);
+}
+async function unstable_mergeBranchWithResolve2(cls, id, options) {
+  const loadAs = options.loadAs ?? activeAccountContext.get();
+  const node = "node" in loadAs ? loadAs.node : loadAs.$jazz.localNode;
+  const resolve = options.resolve ?? true;
+  const rootNode = new SubscriptionScope(
+    node,
+    resolve,
+    id,
+    {
+      ref: coValueClassFromCoValueClassOrSchema(cls),
+      optional: false
+    },
+    false,
+    false,
+    options.branch
+  );
+  await new Promise((resolve2, reject) => {
+    rootNode.setListener((value) => {
+      if (value.type === "unavailable") {
+        reject(new Error("Unable to load the branch. " + value.toString()));
+      } else if (value.type === "unauthorized") {
+        reject(new Error("Unable to load the branch. " + value.toString()));
+      } else if (value.type === "loaded") {
+        resolve2();
+      }
+      rootNode.destroy();
+    });
+  });
+  unstable_mergeBranch(rootNode);
+}
 
 export {
   zodReExport_exports,
@@ -5942,4 +6063,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-RQHJFPIB.js.map
+//# sourceMappingURL=chunk-AEXYCCQS.js.map