@teambit/snapping 1.0.346 → 1.0.347

package/dist/snapping.main.runtime.d.ts

@@ -88,7 +88,7 @@ export declare class SnappingMain {
      * with a valid semver to that version.
      * tag can be done only on main, not on a lane.
      */
-    tag({ ids, message, version, editor, snapped, unmerged, releaseType, preReleaseId, ignoreIssues, ignoreNewestVersion, skipTests, skipTasks, skipAutoTag, build, unmodified, soft, persist, ignoreBuildErrors, rebuildDepsGraph, incrementBy, disableTagAndSnapPipelines, failFast, }: {
+    tag({ ids, message, version, editor, snapped, unmerged, releaseType, preReleaseId, ignoreIssues, ignoreNewestVersion, skipTests, skipTasks, skipAutoTag, build, unmodified, soft, persist, ignoreBuildErrors, rebuildDepsGraph, incrementBy, disableTagAndSnapPipelines, failFast, includeLocalOnly, }: {
         ids?: string[];
         all?: boolean | string;
         snapped?: boolean;
@@ -119,7 +119,7 @@ export declare class SnappingMain {
      * once a component is snapped on a lane, it becomes part of it.
      */
     snap({ pattern, legacyBitIds, // @todo: change to ComponentID[]. pass only if have the ids already parsed.
-    unmerged, editor, message, ignoreIssues, skipTests, skipTasks, skipAutoSnap, build, disableTagAndSnapPipelines, ignoreBuildErrors, rebuildDepsGraph, unmodified, exitOnFirstFailedTask, }: Partial<BasicTagSnapParams> & {
+    unmerged, editor, message, ignoreIssues, skipTests, skipTasks, skipAutoSnap, build, disableTagAndSnapPipelines, ignoreBuildErrors, rebuildDepsGraph, unmodified, exitOnFirstFailedTask, includeLocalOnly, }: Partial<BasicTagSnapParams> & {
         pattern?: string;
         legacyBitIds?: ComponentIdList;
         unmerged?: boolean;
@@ -180,6 +180,7 @@ export declare class SnappingMain {
      * 2. save all dependencies data from the legacy into DependencyResolver aspect.
      */
     UpdateDepsAspectsSaveIntoDepsResolver(component: Component, updatedIds: string[]): Promise<void>;
+    private getTagPendingComponentsIds;
     private getComponentsToTag;
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];

package/dist/snapping.main.runtime.js

@@ -371,7 +371,8 @@ class SnappingMain {
     rebuildDepsGraph,
     incrementBy = 1,
     disableTagAndSnapPipelines = false,
-    failFast = false
+    failFast = false,
+    includeLocalOnly
   }) {
     if (soft) build = false;
     if (editor && persist) {
@@ -390,7 +391,7 @@ class SnappingMain {
     const {
       bitIds,
       warnings
-    } = await this.getComponentsToTag(unmodified, exactVersion, persist, ids, snapped, unmerged);
+    } = await this.getComponentsToTag(unmodified, exactVersion, persist, ids, snapped, unmerged, includeLocalOnly);
     if (!bitIds.length) return null;
     const compIds = _componentId().ComponentIdList.fromArray(bitIds);
     this.logger.debug(`tagging the following components: ${compIds.toString()}`);
@@ -707,14 +708,17 @@ if you're willing to lose the history from the head to the specified version, us
     ignoreBuildErrors = false,
     rebuildDepsGraph,
     unmodified = false,
-    exitOnFirstFailedTask = false
+    exitOnFirstFailedTask = false,
+    includeLocalOnly
   }) {
     if (!this.workspace) throw new (_workspace().OutsideWorkspaceError)();
     if (pattern && legacyBitIds) throw new Error(`please pass either pattern or legacyBitIds, not both`);
     const consumer = this.workspace.consumer;
     const componentsList = new (_legacy().ComponentsList)(consumer);
     const newComponents = await componentsList.listNewComponents();
-    const ids = legacyBitIds || (await getIdsToSnap(this.workspace));
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const self = this;
+    const ids = legacyBitIds || (await getIdsToSnap());
     if (!ids) return null;
     this.logger.debug(`snapping the following components: ${ids.toString()}`);
     const components = await this.loadComponentsForTagOrSnap(ids);
@@ -761,11 +765,11 @@ if you're willing to lose the history from the head to the specified version, us
     await stagedConfig?.write();
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     return snapResults;
-    async function getIdsToSnap(workspace) {
+    async function getIdsToSnap() {
       if (unmerged) {
         return componentsList.listDuringMergeStateComponents();
       }
-      const tagPendingComponentsIds = unmodified ? await workspace.listPotentialTagIds() : await workspace.listTagPendingIds();
+      const tagPendingComponentsIds = await self.getTagPendingComponentsIds(unmodified, includeLocalOnly);
       if (!tagPendingComponentsIds.length) return null;
       // when unmodified, we ask for all components, throw if no matching. if not unmodified and no matching, see error
       // below, suggesting to use --unmodified flag.
@@ -773,14 +777,14 @@ if you're willing to lose the history from the head to the specified version, us
       const getCompIds = async () => {
         if (!pattern) return tagPendingComponentsIds;
         if (!pattern.includes('*') && !pattern.includes(',')) {
-          const compId = await workspace.resolveComponentId(pattern);
+          const compId = await self.workspace.resolveComponentId(pattern);
           return [compId];
         }
-        return workspace.filterIdsFromPoolIdsByPattern(pattern, tagPendingComponentsIds, shouldThrowForNoMatching);
+        return self.workspace.filterIdsFromPoolIdsByPattern(pattern, tagPendingComponentsIds, shouldThrowForNoMatching);
       };
       const componentIds = await getCompIds();
       if (!componentIds.length && pattern) {
-        const allTagPending = await workspace.listPotentialTagIds();
+        const allTagPending = await self.workspace.listPotentialTagIds();
         if (allTagPending.length) {
           throw new (_bitError().BitError)(`unable to find matching for "${pattern}" pattern among modified/new components.
 there are matching among unmodified components though. consider using --unmodified flag if needed.
@@ -1269,7 +1273,19 @@ another option, in case this dependency is not in main yet is to remove all refe
     const extension = new (_config().ExtensionDataEntry)(undefined, undefined, extId, undefined, data);
     component.config.extensions.push(extension);
   }
-  async getComponentsToTag(includeUnmodified, exactVersion, persist, ids, snapped, unmerged) {
+  async getTagPendingComponentsIds(includeUnmodified = false, includeLocalOnly = false) {
+    const ids = includeUnmodified ? await this.workspace.listPotentialTagIds() : await this.workspace.listTagPendingIds();
+    if (includeLocalOnly) {
+      return ids;
+    }
+    const localOnlyIds = this.workspace.filter.byLocalOnly(ids);
+    if (!localOnlyIds.length) {
+      return ids;
+    }
+    const localOnlyListIds = _componentId().ComponentIdList.fromArray(localOnlyIds);
+    return ids.filter(id => !localOnlyListIds.hasWithoutVersion(id));
+  }
+  async getComponentsToTag(includeUnmodified, exactVersion, persist, ids, snapped, unmerged, includeLocalOnly = false) {
     const warnings = [];
     const componentsList = new (_legacy().ComponentsList)(this.workspace.consumer);
     if (persist) {
@@ -1279,8 +1295,18 @@ another option, in case this dependency is not in main yet is to remove all refe
         warnings: []
       };
     }
-    const tagPendingComponentsIds = includeUnmodified ? await this.workspace.listPotentialTagIds() : await this.workspace.listTagPendingIds();
+    const tagPendingComponentsIds = await this.getTagPendingComponentsIds(includeUnmodified, includeLocalOnly);
     const snappedComponentsIds = (await this.workspace.filter.bySnappedOnMain()).map(id => id.changeVersion(undefined));
+    if (snappedComponentsIds.length && !includeLocalOnly) {
+      const localOnlyIds = this.workspace.filter.byLocalOnly(snappedComponentsIds);
+      const localOnlyListIds = _componentId().ComponentIdList.fromArray(localOnlyIds);
+      snappedComponentsIds.forEach(id => {
+        if (localOnlyListIds.hasWithoutVersion(id)) {
+          const index = snappedComponentsIds.findIndex(c => c.isEqual(id));
+          snappedComponentsIds.splice(index, 1);
+        }
+      });
+    }
     if (ids.length) {
       const componentIds = await (0, _pMapSeries().default)(ids, async id => {
         const [idWithoutVer, version] = id.split('@');
@@ -1313,10 +1339,9 @@ another option, in case this dependency is not in main yet is to remove all refe
         warnings
       };
     }
-    const tagPendingBitIds = tagPendingComponentsIds.map(id => id);
-    const tagPendingBitIdsIncludeSnapped = [...tagPendingBitIds, ...snappedComponentsIds];
+    const tagPendingBitIdsIncludeSnapped = [...tagPendingComponentsIds, ...snappedComponentsIds];
     if (includeUnmodified && exactVersion) {
-      const tagPendingComponentsLatest = await this.workspace.scope.legacyScope.latestVersions(tagPendingBitIds, false);
+      const tagPendingComponentsLatest = await this.workspace.scope.legacyScope.latestVersions(tagPendingComponentsIds, false);
       tagPendingComponentsLatest.forEach(componentId => {
         if (componentId.version && _semver().default.valid(componentId.version) && _semver().default.gt(componentId.version, exactVersion)) {
           warnings.push(`warning: ${componentId.toString()} has a version greater than ${exactVersion}`);