@teambit/objects 0.0.0-5be319555d98d49c2099758655937e7c2e6411f9 → 0.0.0-5c0883ce645072cbf1658815bbb0aa5cd9cc9bda

package/dist/models/lane.d.ts

@@ -80,7 +80,7 @@ export default class Lane extends BitObject {
         profileImage?: string;
     }): Lane;
     static parse(contents: string, hash: string): Lane;
-    toBuffer(pretty?: boolean): Buffer;
+    toBuffer(pretty?: boolean): Buffer<ArrayBuffer>;
     addComponent(component: LaneComponent): void;
     removeComponentFromUpdateDependentsIfExist(componentId: ComponentID): void;
     addComponentToUpdateDependents(componentId: ComponentID): void;

package/dist/models/model-component.d.ts

@@ -268,7 +268,7 @@ export default class Component extends BitObject {
     private addDepsInfoFromDepsResolver;
     refs(): Ref[];
     validateBeforePersisting(componentStr: string): void;
-    toBuffer(pretty: boolean): Buffer;
+    toBuffer(pretty: boolean): Buffer<ArrayBuffer>;
     /**
      * Clear data that is relevant only for the local scope and should not be moved to the remote scope
      */

package/dist/models/model-component.js

@@ -770,8 +770,8 @@ class Component extends _objects().BitObject {
     if (parent && head && !parent.isEqual(head) && !overrideHead) {
       if (detachHead) this.detachedHeads.setHead(version.hash());else throw new Error(`unable to add a new version for "${this.id()}" on main.
 this version started from an older version (${previouslyUsedVersion}), and not from the head (${head}).
-if this is done intentionally, please re-run with --detach-head (or --override-head if available).
-otherwise, please run "bit checkout head" to be up to date, then snap/tag your changes.`);
+please run "bit checkout head" to be up to date, then snap/tag your changes.
+if this is done intentionally, you can use --detach-head (or --override-head if available), but make sure you understand the implications as this is an experimental feature that may not be fully stable.`);
     } else {
       this.setHead(version.hash());
       this.detachedHeads.clearCurrent();
@@ -1199,6 +1199,26 @@ consider using --ignore-missing-artifacts flag if you're sure the artifacts are
     await this.setDivergeData(repo, undefined, undefined, workspaceId);
     const divergeData = this.getDivergeData();
     const localHashes = divergeData.snapsOnSourceOnly;
+
+    // When there's a detached head, divergeData only includes the detached head lineage.
+    // We also need to include unexported versions from the main head lineage.
+    const hasDetachedHead = this.detachedHeads && this.detachedHeads.getAllHeads().length > 0;
+    if (hasDetachedHead && this.head) {
+      // Calculate divergence from the main head as well
+      const mainHeadDivergeData = await (0, _component2().getDivergeData)({
+        repo,
+        modelComponent: this,
+        targetHead: (this.laneId ? this.calculatedRemoteHeadWhenOnLane : this.remoteHead) || null,
+        sourceHead: this.head,
+        throws: false
+      });
+      // Add main head local versions that aren't already in localHashes
+      for (const hash of mainHeadDivergeData.snapsOnSourceOnly) {
+        if (!localHashes.find(h => h.isEqual(hash))) {
+          localHashes.push(hash);
+        }
+      }
+    }
     if (!localHashes.length) return [];
     return localHashes.reverse(); // reverse to get the older first
   }