@teambit/objects 0.0.488 → 0.0.489

package/models/lane.ts

@@ -50,10 +50,11 @@ export default class Lane extends BitObject {
   isNew = false; // doesn't get saved in the object. only needed for in-memory instance
   hasChanged = false; // doesn't get saved in the object. only needed for in-memory instance
   /**
-   * populated when a user clicks on "update" in the UI. it's a list of components that are dependents on the
-   * components in the lane. their dependencies are updated according to the lane.
-   * from the CLI perspective, it's added by "bit _snap" and merged by "bit _merge-lane".
-   * otherwise, the user is not aware of it. it's not imported to the workspace and the objects are not fetched.
+   * components that are dependents of components in the lane and need to be re-snapped against the
+   * lane's heads. populated by the bare-scope cascade producer (UI "snap updates" / `bit _snap`)
+   * and by `bit _merge-lane`. these entries are part of the lane's graph (Ripple CI builds them,
+   * merge engine refreshes them) but are intentionally hidden from workspace-facing flows
+   * (`bit status`, `bit compile`, `bit install`, the bitmap).
    */
   updateDependents?: ComponentID[];
   private overrideUpdateDependents?: boolean;
@@ -179,7 +180,12 @@ export default class Lane extends BitObject {
   addComponent(component: LaneComponent) {
     const existsComponent = this.getComponent(component.id);
     if (existsComponent) {
-      if (!existsComponent.head.isEqual(component.head)) this.hasChanged = true;
+      if (
+        !existsComponent.head.isEqual(component.head) ||
+        Boolean(existsComponent.isDeleted) !== Boolean(component.isDeleted)
+      ) {
+        this.hasChanged = true;
+      }
       existsComponent.id = component.id;
       existsComponent.head = component.head;
       existsComponent.isDeleted = component.isDeleted;
@@ -189,39 +195,49 @@ export default class Lane extends BitObject {
       this.hasChanged = true;
     }
   }
+  findUpdateDependent(componentId: ComponentID): ComponentID | undefined {
+    return this.updateDependents?.find((c) => c.isEqualWithoutVersion(componentId));
+  }
+  getUpdateDependentAsLaneComponent(componentId: ComponentID): LaneComponent | undefined {
+    const found = this.findUpdateDependent(componentId);
+    if (!found?.version) return undefined;
+    return { id: found.changeVersion(undefined), head: Ref.from(found.version) };
+  }
   removeComponentFromUpdateDependentsIfExist(componentId: ComponentID) {
-    const updateDependentsList = ComponentIdList.fromArray(this.updateDependents || []);
-    const exist = updateDependentsList.searchWithoutVersion(componentId);
-    if (!exist) return;
-    this.updateDependents = updateDependentsList.removeIfExist(exist);
-    if (!this.updateDependents.length) this.updateDependents = undefined;
+    if (!this.findUpdateDependent(componentId)) return;
+    this.updateDependents = this.updateDependents?.filter((c) => !c.isEqualWithoutVersion(componentId));
+    if (!this.updateDependents?.length) this.updateDependents = undefined;
     this.hasChanged = true;
   }
   addComponentToUpdateDependents(componentId: ComponentID) {
+    if (!componentId.hasVersion()) {
+      throw new ValidationError(`Lane.addComponentToUpdateDependents: ${componentId.toString()} is missing a version`);
+    }
     this.removeComponentFromUpdateDependentsIfExist(componentId);
     (this.updateDependents ||= []).push(componentId);
     this.hasChanged = true;
   }
   removeAllUpdateDependents() {
-    if (this.updateDependents?.length) return;
+    if (!this.updateDependents?.length) return;
     this.updateDependents = undefined;
     this.hasChanged = true;
   }
-  shouldOverrideUpdateDependents() {
-    return this.overrideUpdateDependents;
-  }
   /**
-   * !!! important !!!
-   * this should get called only on a "temp lane", such as running "bit _snap", which the scope gets destroys after the
-   * command is done. when _scope exports the lane, this "overrideUpdateDependents" is not saved to the remote-scope.
-   *
-   * on a user local lane object, this prop should never be true. otherwise, it'll override the remote-scope data.
+   * Signals an explicit `_snap --update-dependents` insertion. On export, the receiving scope
+   * gates its "add this new hidden entry" branch on this flag so a stale workspace lane can't
+   * resurrect entries the Cloud UI dropped. Workspace cascades — which only update existing
+   * entries — deliberately do NOT set the flag. The field is also serialized by `Lane.toObject`
+   * for older remotes that gate their pre-diverge-check override branch on it.
    */
   setOverrideUpdateDependents(overrideUpdateDependents: boolean) {
     this.overrideUpdateDependents = overrideUpdateDependents;
     this.hasChanged = true;
   }
 
+  shouldOverrideUpdateDependents(): boolean {
+    return Boolean(this.overrideUpdateDependents);
+  }
+
   removeComponent(id: ComponentID): boolean {
     const existsComponent = this.getComponent(id);
     if (!existsComponent) return false;
@@ -240,7 +256,11 @@ export default class Lane extends BitObject {
   setLaneComponents(laneComponents: LaneComponent[]) {
     // this gets called when adding lane-components from other lanes/remotes, so it's better to
     // clone the objects to not change the original data.
-    this.components = laneComponents.map((c) => ({ id: c.id.clone(), head: c.head.clone() }));
+    this.components = laneComponents.map((c) => ({
+      id: c.id.clone(),
+      head: c.head.clone(),
+      ...(c.isDeleted && { isDeleted: c.isDeleted }),
+    }));
     this.hasChanged = true;
   }
   setReadmeComponent(id?: ComponentID) {
@@ -325,9 +345,7 @@ export default class Lane extends BitObject {
   getCompHeadIncludeUpdateDependents(componentId: ComponentID): Ref | undefined {
     const comp = this.getComponent(componentId);
     if (comp) return comp.head;
-    const fromUpdateDependents = this.updateDependents?.find((c) => c.isEqualWithoutVersion(componentId));
-    if (fromUpdateDependents) return Ref.from(fromUpdateDependents.version);
-    return undefined;
+    return this.getUpdateDependentAsLaneComponent(componentId)?.head;
   }
   validate() {
     const message = `unable to save Lane object "${this.id()}"`;
@@ -353,9 +371,22 @@ export default class Lane extends BitObject {
   }
   isEqual(lane: Lane): boolean {
     if (this.id() !== lane.id()) return false;
-    const thisComponents = this.toComponentIds().toStringArray().sort();
-    const otherComponents = lane.toComponentIds().toStringArray().sort();
-    return isEqual(thisComponents, otherComponents);
+    // include isDeleted in equality so a soft-delete flip with the same head still counts as a
+    // state change — `Lane.isEqual` is used by importers to decide whether to write a
+    // LaneHistory entry.
+    const normalize = (l: Lane) =>
+      l.components
+        .map((c) => ({
+          id: c.id.toStringWithoutVersion(),
+          head: c.head.toString(),
+          isDeleted: Boolean(c.isDeleted),
+        }))
+        .sort((a, b) =>
+          `${a.id}@${a.head}:${a.isDeleted ? 1 : 0}`.localeCompare(`${b.id}@${b.head}:${b.isDeleted ? 1 : 0}`)
+        );
+    const thisUpdDeps = (this.updateDependents || []).map((c) => c.toString()).sort();
+    const otherUpdDeps = (lane.updateDependents || []).map((c) => c.toString()).sort();
+    return isEqual(normalize(this), normalize(lane)) && isEqual(thisUpdDeps, otherUpdDeps);
   }
   clone() {
     return new Lane({
@@ -363,6 +394,7 @@ export default class Lane extends BitObject {
       hash: this._hash,
       overrideUpdateDependents: this.overrideUpdateDependents,
       components: cloneDeep(this.components),
+      updateDependents: this.updateDependents ? cloneDeep(this.updateDependents) : undefined,
     });
   }
 }

package/models/model-component.ts

@@ -382,7 +382,9 @@ export default class Component extends BitObject {
 
   setLaneHeadLocal(lane?: Lane) {
     if (lane) {
-      this.laneHeadLocal = lane.getComponentHead(this.toComponentId());
+      // include lane.updateDependents — hidden cascade entries need a lane-local head so the
+      // export-pending detector picks them up after a workspace cascade snap.
+      this.laneHeadLocal = lane.getCompHeadIncludeUpdateDependents(this.toComponentId()) || null;
     }
   }
 
@@ -704,11 +706,27 @@ export default class Component extends BitObject {
       if (parent && !parent.isEqual(versionToAddRef)) {
         version.addAsOnlyParent(parent);
       }
-      if (addToUpdateDependentsInLane) {
+      // When the caller didn't explicitly opt in or out, preserve the existing entry's bucket so
+      // a merge-from-main producing a new snap for a hidden updateDependent keeps it hidden
+      // rather than promoting it into workspace-tracked state.
+      const existingHidden = lane.findUpdateDependent(currentBitId);
+      const existingVisible = lane.getComponent(currentBitId);
+      const shouldBeHidden = addToUpdateDependentsInLane ?? (Boolean(existingHidden) && !existingVisible);
+      if (shouldBeHidden) {
+        if (existingVisible) lane.removeComponent(currentBitId);
         lane.addComponentToUpdateDependents(currentBitId.changeVersion(versionToAddRef.toString()));
-        lane.setOverrideUpdateDependents(true);
+        // Only brand-new hidden insertions raise the wire flag — that's the `_snap --update-dependents`
+        // path adding a component that wasn't already on the lane. Cascades update an existing
+        // hidden entry (wasAlreadyHidden=true) and must NOT raise the flag, otherwise origin would
+        // re-add entries the Cloud UI explicitly dropped.
+        if (!existingHidden) lane.setOverrideUpdateDependents(true);
       } else {
-        lane.addComponent({ id: currentBitId, head: versionToAddRef, isDeleted: version.isRemoved() });
+        if (existingHidden) lane.removeComponentFromUpdateDependentsIfExist(currentBitId);
+        lane.addComponent({
+          id: currentBitId,
+          head: versionToAddRef,
+          isDeleted: version.isRemoved(),
+        });
       }
 
       if (lane.readmeComponent && lane.readmeComponent.id.fullName === currentBitId.fullName) {

package/package.json

@@ -1,62 +1,62 @@
 {
   "name": "@teambit/objects",
-  "version": "0.0.488",
+  "version": "0.0.489",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "0.0.488"
+    "version": "0.0.489"
   },
   "dependencies": {
-    "@pnpm/dependency-path": "1001.1.10",
-    "@pnpm/lockfile.types": "^1002.1.0",
-    "semver": "7.7.1",
     "lodash": "4.17.21",
-    "uuid": "8.3.2",
-    "async-mutex": "0.3.1",
-    "p-map-series": "2.1.0",
     "tar-stream": "2.2.0",
+    "p-map-series": "2.1.0",
+    "async-mutex": "0.3.1",
     "fs-extra": "10.0.0",
     "glob": "13.0.0",
     "uid-number": "0.0.6",
+    "@pnpm/dependency-path": "1001.1.10",
+    "@pnpm/lockfile.types": "^1002.1.0",
+    "semver": "7.7.1",
+    "uuid": "8.3.2",
     "@teambit/harmony": "0.4.7",
     "@teambit/component-id": "1.2.4",
+    "@teambit/graph.cleargraph": "0.0.11",
+    "@teambit/harmony.modules.concurrency": "0.0.27",
+    "@teambit/legacy.logger": "0.0.38",
+    "@teambit/toolbox.promise.map-pool": "0.0.14",
+    "@teambit/legacy.constants": "0.0.26",
+    "@teambit/legacy.utils": "0.0.36",
+    "@teambit/toolbox.crypto.sha1": "0.0.15",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.30",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.13",
     "@teambit/lane-id": "0.0.312",
     "@teambit/legacy.cli.error": "0.0.38",
-    "@teambit/legacy.constants": "0.0.26",
-    "@teambit/legacy.logger": "0.0.38",
-    "@teambit/toolbox.crypto.sha1": "0.0.15",
     "@teambit/legacy-bit-id": "1.1.3",
     "@teambit/legacy-component-log": "0.0.417",
     "@teambit/pkg.modules.semver-helper": "0.0.22",
     "@teambit/toolbox.array.duplications-finder": "0.0.3",
-    "@teambit/graph.cleargraph": "0.0.11",
     "@teambit/bit.get-bit-version": "0.0.15",
-    "@teambit/harmony.modules.concurrency": "0.0.27",
-    "@teambit/toolbox.promise.map-pool": "0.0.14",
-    "@teambit/harmony.modules.in-memory-cache": "0.0.30",
-    "@teambit/toolbox.fs.remove-empty-dir": "0.0.13",
-    "@teambit/cli": "0.0.1322",
-    "@teambit/legacy.utils": "0.0.36",
-    "@teambit/harmony.modules.get-basic-log": "0.0.114",
-    "@teambit/component.snap-distance": "0.0.114",
-    "@teambit/config-store": "0.0.203",
-    "@teambit/legacy.scope": "0.0.113",
-    "@teambit/component.sources": "0.0.165",
-    "@teambit/legacy.consumer-component": "0.0.114",
-    "@teambit/legacy.consumer-config": "0.0.113",
-    "@teambit/legacy.extension-data": "0.0.115",
-    "@teambit/semantics.doc-parser": "0.0.121",
-    "@teambit/graph": "1.0.981"
+    "@teambit/cli": "0.0.1323",
+    "@teambit/component.snap-distance": "0.0.115",
+    "@teambit/graph": "1.0.982",
+    "@teambit/legacy.scope": "0.0.114",
+    "@teambit/harmony.modules.get-basic-log": "0.0.115",
+    "@teambit/config-store": "0.0.204",
+    "@teambit/component.sources": "0.0.166",
+    "@teambit/legacy.consumer-component": "0.0.115",
+    "@teambit/legacy.consumer-config": "0.0.114",
+    "@teambit/legacy.extension-data": "0.0.116",
+    "@teambit/semantics.doc-parser": "0.0.122"
   },
   "devDependencies": {
-    "@types/semver": "7.5.8",
     "@types/lodash": "4.14.165",
-    "@types/uuid": "8.3.4",
     "@types/fs-extra": "9.0.7",
+    "@types/semver": "7.5.8",
+    "@types/uuid": "8.3.4",
     "@teambit/harmony.envs.core-aspect-env": "0.1.4"
   },
   "peerDependencies": {