@teambit/snapping 1.0.929 → 1.0.931

package/dist/reset-component.d.ts

@@ -12,6 +12,8 @@ export type ResetResult = {
      * we want .bitmap to have the version before the detachment. not as the head.
      */
     versionToSetInBitmap?: string;
+    /** batchIds from the version objects being removed, used to clean up lane history entries */
+    batchIds?: string[];
 };
 /**
  * If head is false, remove all local versions.

package/dist/reset-component.js

@@ -7,6 +7,13 @@ exports.getComponentsWithOptionToUntag = getComponentsWithOptionToUntag;
 exports.removeLocalVersion = removeLocalVersion;
 exports.removeLocalVersionsForAllComponents = removeLocalVersionsForAllComponents;
 exports.removeLocalVersionsForMultipleComponents = removeLocalVersionsForMultipleComponents;
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
 function _bitError() {
   const data = require("@teambit/bit-error");
   _bitError = function () {
@@ -63,6 +70,15 @@ async function removeLocalVersion(consumer, id, lane, head, force = false) {
       }
     });
   }
+
+  // Load version objects to extract batchIds before they are removed.
+  // These batchIds are used to clean up the corresponding lane history entries.
+  // Only needed on lanes — on main there's no lane history to clean up.
+  let batchIds;
+  if (lane) {
+    const versionObjects = await Promise.all(versionsToRemoveStr.map(ver => component.loadVersion(ver, consumer.scope.objects, false)));
+    batchIds = [...new Set((0, _lodash().compact)((0, _lodash().compact)(versionObjects).map(v => v.batchId)))];
+  }
   const headBefore = component.getHead();
   await consumer.scope.sources.removeComponentVersions(component, versionsToRemove, versionsToRemoveStr, lane, head);
   const headAfter = component.getHead();
@@ -77,7 +93,8 @@ async function removeLocalVersion(consumer, id, lane, head, force = false) {
     id,
     versions: versionsToRemoveStr,
     component,
-    versionToSetInBitmap
+    versionToSetInBitmap,
+    batchIds
   };
 }
 async function removeLocalVersionsForAllComponents(workspace, remove, lane, head) {

package/dist/reset-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_legacy","_legacy2","_legacy3","removeLocalVersion","consumer","id","lane","head","force","component","scope","getModelComponent","idStr","toString","fromBitmap","bitMap","getComponentIdIfExist","localVersions","getLocalHashes","objects","length","BitError","headRef","getHeadRegardlessOfLane","Error","find","v","isEqual","versionsToRemove","versionsToRemoveStr","switchHashesWithTagsIfExist","dependencyGraph","DependencyGraph","loadAllVersions","forEach","versionToRemove","idWithVersion","toComponentId","changeVersion","dependents","getImmediateDependentsPerId","join","headBefore","getHead","sources","removeComponentVersions","headAfter","versionToSetInBitmap","divergeData","getDivergeData","snapBeforeDetached","commonSnapBeforeDiverge","getTagOfRefIfExists","versions","removeLocalVersionsForAllComponents","workspace","remove","componentsToUntag","getComponentsWithOptionToUntag","removeLocalVersionsForMultipleComponents","candidateComponentsIds","map","bitId","candidateComponentsIdsStr","dependentsNotCandidates","filter","dependent","includes","version","logger","debug","Promise","all","componentList","ComponentsList","laneObj","getCurrentLaneObject","components","listExportPendingComponents","removedStagedIds","getRemovedStaged","removedStagedBitIds","nonExistsInStaged","c","isEqualWithoutVersion","modelComps","push"],"sources":["reset-component.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport type { ComponentID } from '@teambit/component-id';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { logger } from '@teambit/legacy.logger';\nimport type { Lane, ModelComponent } from '@teambit/objects';\nimport type { RemoveMain } from '@teambit/remove';\nimport { DependencyGraph } from '@teambit/legacy.dependency-graph';\nimport type { Workspace } from '@teambit/workspace';\n\nexport type ResetResult = {\n  id: ComponentID;\n  versions: string[];\n  component?: ModelComponent;\n  /**\n   * relevant when the component was detached head so the head didn't change.\n   * we want .bitmap to have the version before the detachment. not as the head.\n   */\n  versionToSetInBitmap?: string;\n};\n\n/**\n * If head is false, remove all local versions.\n */\nexport async function removeLocalVersion(\n  consumer: Consumer,\n  id: ComponentID,\n  lane?: Lane,\n  head?: boolean,\n  force = false\n): Promise<ResetResult> {\n  const component: ModelComponent = await consumer.scope.getModelComponent(id);\n  const idStr = id.toString();\n  const fromBitmap = consumer.bitMap.getComponentIdIfExist(id);\n  const localVersions = await component.getLocalHashes(consumer.scope.objects, fromBitmap);\n  if (!localVersions.length) throw new BitError(`unable to untag ${idStr}, the component is not staged`);\n  const headRef = component.getHeadRegardlessOfLane();\n  if (!headRef) {\n    throw new Error(`unable to reset ${idStr}, it has not head`);\n  }\n  if (head && !localVersions.find((v) => v.isEqual(headRef))) {\n    throw new Error(`unable to reset ${idStr}, the head ${headRef.toString()} is exported`);\n  }\n  const versionsToRemove = head ? [headRef] : localVersions;\n  const versionsToRemoveStr = component.switchHashesWithTagsIfExist(versionsToRemove);\n\n  if (!force) {\n    const dependencyGraph = await DependencyGraph.loadAllVersions(consumer.scope);\n\n    versionsToRemoveStr.forEach((versionToRemove) => {\n      const idWithVersion = component.toComponentId().changeVersion(versionToRemove);\n      const dependents = dependencyGraph.getImmediateDependentsPerId(idWithVersion);\n      if (dependents.length) {\n        throw new BitError(\n          `unable to reset ${idStr}, the version ${versionToRemove} has the following dependent(s) ${dependents.join(\n            ', '\n          )}`\n        );\n      }\n    });\n  }\n\n  const headBefore = component.getHead();\n  await consumer.scope.sources.removeComponentVersions(component, versionsToRemove, versionsToRemoveStr, lane, head);\n  const headAfter = component.getHead();\n  let versionToSetInBitmap;\n  if (headBefore && headAfter && headBefore.isEqual(headAfter) && !lane) {\n    // if it's on main and the head didn't change, it means that it was in a detached-head state.\n    const divergeData = component.getDivergeData();\n    const snapBeforeDetached = divergeData.commonSnapBeforeDiverge;\n    if (snapBeforeDetached) versionToSetInBitmap = component.getTagOfRefIfExists(snapBeforeDetached);\n  }\n\n  return { id, versions: versionsToRemoveStr, component, versionToSetInBitmap };\n}\n\nexport async function removeLocalVersionsForAllComponents(\n  workspace: Workspace,\n  remove: RemoveMain,\n  lane?: Lane,\n  head?: boolean\n): Promise<ResetResult[]> {\n  const componentsToUntag = await getComponentsWithOptionToUntag(workspace, remove);\n  const force = true; // when removing local versions from all components, no need to check if the component is used as a dependency\n  return removeLocalVersionsForMultipleComponents(workspace.consumer, componentsToUntag, lane, head, force);\n}\n\nexport async function removeLocalVersionsForMultipleComponents(\n  consumer: Consumer,\n  componentsToUntag: ModelComponent[],\n  lane?: Lane,\n  head?: boolean,\n  force?: boolean\n) {\n  if (!componentsToUntag.length) {\n    throw new BitError(`no components found to reset on your workspace`);\n  }\n  // if only head is removed, there is risk of deleting dependencies version without their dependents.\n  if (!force && head) {\n    const dependencyGraph = await DependencyGraph.loadAllVersions(consumer.scope);\n    const candidateComponentsIds = componentsToUntag.map((component) => {\n      const bitId = component.toComponentId();\n      const headRef = component.getHeadRegardlessOfLane();\n      if (!headRef)\n        throw new Error(`component ${bitId.toString()} does not have head. it should not be a candidate for reset`);\n\n      return bitId.changeVersion(component.getTagOfRefIfExists(headRef) || headRef.toString());\n    });\n    const candidateComponentsIdsStr = candidateComponentsIds.map((id) => id.toString());\n    candidateComponentsIds.forEach((bitId: ComponentID) => {\n      const dependents = dependencyGraph.getImmediateDependentsPerId(bitId);\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      const dependentsNotCandidates = dependents.filter((dependent) => !candidateComponentsIdsStr.includes(dependent));\n      if (dependentsNotCandidates.length) {\n        throw new BitError( // $FlowFixMe\n          `unable to untag ${bitId}, the version ${bitId.version} has the following dependent(s) ${dependents.join(\n            ', '\n          )}`\n        );\n      }\n    });\n  }\n  logger.debug(`found ${componentsToUntag.length} components to untag`);\n  return Promise.all(\n    componentsToUntag.map((component) => removeLocalVersion(consumer, component.toComponentId(), lane, head, force))\n  );\n}\n\nexport async function getComponentsWithOptionToUntag(\n  workspace: Workspace,\n  remove: RemoveMain\n): Promise<ModelComponent[]> {\n  const componentList = new ComponentsList(workspace);\n  const laneObj = await workspace.getCurrentLaneObject();\n  const components: ModelComponent[] = await componentList.listExportPendingComponents(laneObj);\n  const removedStagedIds = await remove.getRemovedStaged();\n  if (!removedStagedIds.length) return components;\n  const removedStagedBitIds = removedStagedIds.map((id) => id);\n  const nonExistsInStaged = removedStagedBitIds.filter(\n    (id) => !components.find((c) => c.toComponentId().isEqualWithoutVersion(id))\n  );\n  if (!nonExistsInStaged.length) return components;\n  const modelComps = await Promise.all(nonExistsInStaged.map((id) => workspace.consumer.scope.getModelComponent(id)));\n  components.push(...modelComps);\n\n  return components;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_lodash","data","require","_bitError","_legacy","_legacy2","_legacy3","removeLocalVersion","consumer","id","lane","head","force","component","scope","getModelComponent","idStr","toString","fromBitmap","bitMap","getComponentIdIfExist","localVersions","getLocalHashes","objects","length","BitError","headRef","getHeadRegardlessOfLane","Error","find","v","isEqual","versionsToRemove","versionsToRemoveStr","switchHashesWithTagsIfExist","dependencyGraph","DependencyGraph","loadAllVersions","forEach","versionToRemove","idWithVersion","toComponentId","changeVersion","dependents","getImmediateDependentsPerId","join","batchIds","versionObjects","Promise","all","map","ver","loadVersion","Set","compact","batchId","headBefore","getHead","sources","removeComponentVersions","headAfter","versionToSetInBitmap","divergeData","getDivergeData","snapBeforeDetached","commonSnapBeforeDiverge","getTagOfRefIfExists","versions","removeLocalVersionsForAllComponents","workspace","remove","componentsToUntag","getComponentsWithOptionToUntag","removeLocalVersionsForMultipleComponents","candidateComponentsIds","bitId","candidateComponentsIdsStr","dependentsNotCandidates","filter","dependent","includes","version","logger","debug","componentList","ComponentsList","laneObj","getCurrentLaneObject","components","listExportPendingComponents","removedStagedIds","getRemovedStaged","removedStagedBitIds","nonExistsInStaged","c","isEqualWithoutVersion","modelComps","push"],"sources":["reset-component.ts"],"sourcesContent":["import { compact } from 'lodash';\nimport { BitError } from '@teambit/bit-error';\nimport type { ComponentID } from '@teambit/component-id';\nimport type { Consumer } from '@teambit/legacy.consumer';\nimport { ComponentsList } from '@teambit/legacy.component-list';\nimport { logger } from '@teambit/legacy.logger';\nimport type { Lane, ModelComponent } from '@teambit/objects';\nimport type { RemoveMain } from '@teambit/remove';\nimport { DependencyGraph } from '@teambit/legacy.dependency-graph';\nimport type { Workspace } from '@teambit/workspace';\n\nexport type ResetResult = {\n  id: ComponentID;\n  versions: string[];\n  component?: ModelComponent;\n  /**\n   * relevant when the component was detached head so the head didn't change.\n   * we want .bitmap to have the version before the detachment. not as the head.\n   */\n  versionToSetInBitmap?: string;\n  /** batchIds from the version objects being removed, used to clean up lane history entries */\n  batchIds?: string[];\n};\n\n/**\n * If head is false, remove all local versions.\n */\nexport async function removeLocalVersion(\n  consumer: Consumer,\n  id: ComponentID,\n  lane?: Lane,\n  head?: boolean,\n  force = false\n): Promise<ResetResult> {\n  const component: ModelComponent = await consumer.scope.getModelComponent(id);\n  const idStr = id.toString();\n  const fromBitmap = consumer.bitMap.getComponentIdIfExist(id);\n  const localVersions = await component.getLocalHashes(consumer.scope.objects, fromBitmap);\n  if (!localVersions.length) throw new BitError(`unable to untag ${idStr}, the component is not staged`);\n  const headRef = component.getHeadRegardlessOfLane();\n  if (!headRef) {\n    throw new Error(`unable to reset ${idStr}, it has not head`);\n  }\n  if (head && !localVersions.find((v) => v.isEqual(headRef))) {\n    throw new Error(`unable to reset ${idStr}, the head ${headRef.toString()} is exported`);\n  }\n  const versionsToRemove = head ? [headRef] : localVersions;\n  const versionsToRemoveStr = component.switchHashesWithTagsIfExist(versionsToRemove);\n\n  if (!force) {\n    const dependencyGraph = await DependencyGraph.loadAllVersions(consumer.scope);\n\n    versionsToRemoveStr.forEach((versionToRemove) => {\n      const idWithVersion = component.toComponentId().changeVersion(versionToRemove);\n      const dependents = dependencyGraph.getImmediateDependentsPerId(idWithVersion);\n      if (dependents.length) {\n        throw new BitError(\n          `unable to reset ${idStr}, the version ${versionToRemove} has the following dependent(s) ${dependents.join(\n            ', '\n          )}`\n        );\n      }\n    });\n  }\n\n  // Load version objects to extract batchIds before they are removed.\n  // These batchIds are used to clean up the corresponding lane history entries.\n  // Only needed on lanes — on main there's no lane history to clean up.\n  let batchIds: string[] | undefined;\n  if (lane) {\n    const versionObjects = await Promise.all(\n      versionsToRemoveStr.map((ver) => component.loadVersion(ver, consumer.scope.objects, false))\n    );\n    batchIds = [...new Set(compact(compact(versionObjects).map((v) => v.batchId)))];\n  }\n\n  const headBefore = component.getHead();\n  await consumer.scope.sources.removeComponentVersions(component, versionsToRemove, versionsToRemoveStr, lane, head);\n  const headAfter = component.getHead();\n  let versionToSetInBitmap;\n  if (headBefore && headAfter && headBefore.isEqual(headAfter) && !lane) {\n    // if it's on main and the head didn't change, it means that it was in a detached-head state.\n    const divergeData = component.getDivergeData();\n    const snapBeforeDetached = divergeData.commonSnapBeforeDiverge;\n    if (snapBeforeDetached) versionToSetInBitmap = component.getTagOfRefIfExists(snapBeforeDetached);\n  }\n\n  return { id, versions: versionsToRemoveStr, component, versionToSetInBitmap, batchIds };\n}\n\nexport async function removeLocalVersionsForAllComponents(\n  workspace: Workspace,\n  remove: RemoveMain,\n  lane?: Lane,\n  head?: boolean\n): Promise<ResetResult[]> {\n  const componentsToUntag = await getComponentsWithOptionToUntag(workspace, remove);\n  const force = true; // when removing local versions from all components, no need to check if the component is used as a dependency\n  return removeLocalVersionsForMultipleComponents(workspace.consumer, componentsToUntag, lane, head, force);\n}\n\nexport async function removeLocalVersionsForMultipleComponents(\n  consumer: Consumer,\n  componentsToUntag: ModelComponent[],\n  lane?: Lane,\n  head?: boolean,\n  force?: boolean\n) {\n  if (!componentsToUntag.length) {\n    throw new BitError(`no components found to reset on your workspace`);\n  }\n  // if only head is removed, there is risk of deleting dependencies version without their dependents.\n  if (!force && head) {\n    const dependencyGraph = await DependencyGraph.loadAllVersions(consumer.scope);\n    const candidateComponentsIds = componentsToUntag.map((component) => {\n      const bitId = component.toComponentId();\n      const headRef = component.getHeadRegardlessOfLane();\n      if (!headRef)\n        throw new Error(`component ${bitId.toString()} does not have head. it should not be a candidate for reset`);\n\n      return bitId.changeVersion(component.getTagOfRefIfExists(headRef) || headRef.toString());\n    });\n    const candidateComponentsIdsStr = candidateComponentsIds.map((id) => id.toString());\n    candidateComponentsIds.forEach((bitId: ComponentID) => {\n      const dependents = dependencyGraph.getImmediateDependentsPerId(bitId);\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      const dependentsNotCandidates = dependents.filter((dependent) => !candidateComponentsIdsStr.includes(dependent));\n      if (dependentsNotCandidates.length) {\n        throw new BitError( // $FlowFixMe\n          `unable to untag ${bitId}, the version ${bitId.version} has the following dependent(s) ${dependents.join(\n            ', '\n          )}`\n        );\n      }\n    });\n  }\n  logger.debug(`found ${componentsToUntag.length} components to untag`);\n  return Promise.all(\n    componentsToUntag.map((component) => removeLocalVersion(consumer, component.toComponentId(), lane, head, force))\n  );\n}\n\nexport async function getComponentsWithOptionToUntag(\n  workspace: Workspace,\n  remove: RemoveMain\n): Promise<ModelComponent[]> {\n  const componentList = new ComponentsList(workspace);\n  const laneObj = await workspace.getCurrentLaneObject();\n  const components: ModelComponent[] = await componentList.listExportPendingComponents(laneObj);\n  const removedStagedIds = await remove.getRemovedStaged();\n  if (!removedStagedIds.length) return components;\n  const removedStagedBitIds = removedStagedIds.map((id) => id);\n  const nonExistsInStaged = removedStagedBitIds.filter(\n    (id) => !components.find((c) => c.toComponentId().isEqualWithoutVersion(id))\n  );\n  if (!nonExistsInStaged.length) return components;\n  const modelComps = await Promise.all(nonExistsInStaged.map((id) => workspace.consumer.scope.getModelComponent(id)));\n  components.push(...modelComps);\n\n  return components;\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/snapping.main.runtime.js

@@ -809,6 +809,17 @@ in case you're unsure about the pattern syntax, use "bit pattern [--help]"`);
     const isRealUntag = !soft;
     if (isRealUntag) {
       results = await untag();
+
+      // Remove lane history entries that correspond to the reset snaps.
+      // Each snap uses its batchId as the lane history key, so we can match them.
+      if (currentLane) {
+        const allBatchIds = (0, _lodash().uniq)(results.flatMap(r => r.batchIds || []));
+        if (allBatchIds.length) {
+          const laneHistory = await consumer.scope.lanes.getOrCreateLaneHistory(currentLane);
+          laneHistory.removeHistoryEntries(allBatchIds);
+          consumer.scope.objects.add(laneHistory);
+        }
+      }
       await consumer.scope.objects.persist();
       const currentLaneId = consumer.getCurrentLaneId();
       const stagedConfig = await this.workspace.scope.getStagedConfig();