@teambit/snapping 1.0.481 → 1.0.483

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

@@ -25,6 +25,7 @@ import { SnapDataPerCompRaw, FileData } from './snap-from-scope.cmd';
 import { untagResult } from './reset-component';
 import { ApplicationMain } from '@teambit/application';
 import { RemoveMain } from '@teambit/remove';
+export type PackageIntegritiesByPublishedPackages = Map<string, string | undefined>;
 export type TagDataPerComp = {
     componentId: ComponentID;
     dependencies: ComponentID[];
@@ -146,12 +147,13 @@ export declare class SnappingMain {
     }>;
     resetNeverExported(): Promise<ComponentID[]>;
     _addFlattenedDependenciesToComponents(components: ConsumerComponent[], rebuildDepsGraph?: boolean): Promise<void>;
+    _addDependenciesGraphToComponents(components: Component[]): Promise<void>;
     throwForDepsFromAnotherLane(components: ConsumerComponent[]): Promise<void>;
     throwForVariousIssues(components: Component[], ignoreIssues?: string): Promise<void>;
     private throwForDepsFromAnotherLaneForComp;
     _addFlattenedDepsGraphToComponents(components: ConsumerComponent[]): Promise<void>;
     _updateComponentsByTagResult(components: ConsumerComponent[], tagResult: LegacyOnTagResult[]): void;
-    _getPublishedPackages(components: ConsumerComponent[]): string[];
+    _getPublishedPackages(components: ConsumerComponent[]): PackageIntegritiesByPublishedPackages;
     _addCompToObjects({ source, lane, shouldValidateVersion, updateDependentsOnLane, }: {
         source: ConsumerComponent;
         lane?: Lane;

package/dist/snapping.main.runtime.js

@@ -235,6 +235,13 @@ function _dependencies() {
   };
   return data;
 }
+function _version() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/scope/models/version"));
+  _version = function () {
+    return data;
+  };
+  return data;
+}
 function _snapCmd() {
   const data = require("./snap-cmd");
   _snapCmd = function () {
@@ -427,6 +434,7 @@ class SnappingMain {
       removedComponents
     } = await (0, _tagModelComponent().tagModelComponent)({
       snapping: this,
+      components,
       consumerComponents,
       ids: compIds,
       message,
@@ -525,6 +533,7 @@ if you're willing to lose the history from the head to the specified version, us
       return comp.buildStatus === _constants().BuildStatus.Succeed && !params.rebuildArtifacts;
     });
     const results = await (0, _tagModelComponent().tagModelComponent)(_objectSpread(_objectSpread({}, params), {}, {
+      components,
       consumerComponents,
       tagDataPerComp,
       populateArtifactsFrom: shouldUsePopulateArtifactsFrom ? components.map(c => c.id) : undefined,
@@ -675,6 +684,7 @@ if you're willing to lose the history from the head to the specified version, us
     const ids = _componentId().ComponentIdList.fromArray(allCompIds);
     const shouldTag = Boolean(params.tag);
     const results = await (0, _tagModelComponent().tagModelComponent)(_objectSpread(_objectSpread({}, params), {}, {
+      components,
       consumerComponents,
       tagDataPerComp: snapDataPerComp.map(s => ({
         componentId: s.componentId,
@@ -760,6 +770,7 @@ if you're willing to lose the history from the head to the specified version, us
     } = await (0, _tagModelComponent().tagModelComponent)({
       snapping: this,
       editor,
+      components,
       consumerComponents,
       ids,
       ignoreNewestVersion: false,
@@ -909,6 +920,24 @@ in case you're unsure about the pattern syntax, use "bit pattern [--help]"`);
     });
     this.logger.profile('snap._addFlattenedDependenciesToComponents');
   }
+  async _addDependenciesGraphToComponents(components) {
+    if (this.workspace == null) {
+      return;
+    }
+    this.logger.profile('snap._addDependenciesGraphToComponents');
+    const componentIdByPkgName = this.dependencyResolver.createComponentIdByPkgNameMap(components);
+    const options = {
+      rootDir: this.workspace.path,
+      rootComponentsPath: this.workspace.rootComponentsPath,
+      componentIdByPkgName
+    };
+    await Promise.all(components.map(async component => {
+      if (component.state._consumer.componentMap?.rootDir) {
+        await this.dependencyResolver.addDependenciesGraph(component, component.state._consumer.componentMap.rootDir, options);
+      }
+    }));
+    this.logger.profile('snap._addDependenciesGraphToComponents');
+  }
   async throwForDepsFromAnotherLane(components) {
     const lane = await this.scope.legacyScope.getCurrentLaneObject();
     const allIds = _componentId().ComponentIdList.fromArray(components.map(c => c.id));
@@ -1046,12 +1075,15 @@ another option, in case this dependency is not in main yet is to remove all refe
     });
   }
   _getPublishedPackages(components) {
-    const publishedPackages = components.map(comp => {
+    const publishedPackages = new Map();
+    for (const comp of components) {
       const builderExt = comp.extensions.findCoreExtension(_constants().Extensions.builder);
       const pkgData = builderExt?.data?.aspectsData?.find(a => a.aspectId === _constants().Extensions.pkg);
-      return pkgData?.data?.publishedPackage;
-    });
-    return (0, _lodash().compact)(publishedPackages);
+      if (pkgData?.data?.publishedPackage != null) {
+        publishedPackages.set(pkgData.data.publishedPackage, pkgData.data.integrity);
+      }
+    }
+    return publishedPackages;
   }
   async _addCompToObjects({
     source,
@@ -1110,7 +1142,8 @@ another option, in case this dependency is not in main yet is to remove all refe
     const {
       version,
       files,
-      flattenedEdges
+      flattenedEdges,
+      dependenciesGraph
     } = await this.scope.legacyScope.sources.consumerComponentToVersion(source);
     version.origin = {
       id: {
@@ -1125,6 +1158,7 @@ another option, in case this dependency is not in main yet is to remove all refe
     };
     objectRepo.add(version);
     if (flattenedEdges) this.objectsRepo.add(flattenedEdges);
+    if (dependenciesGraph) this.objectsRepo.add(dependenciesGraph);
     if (!source.version) throw new Error(`addSource expects source.version to be set`);
     component.addVersion(version, source.version, lane, source.previouslyUsedVersion, updateDependentsOnLane);
     objectRepo.add(component);
@@ -1152,7 +1186,11 @@ another option, in case this dependency is not in main yet is to remove all refe
     version.extensions = consumerComponent.extensions;
     version.buildStatus = consumerComponent.buildStatus;
     const artifactObjects = artifacts.map(file => file.source);
-    return [version, ...artifactObjects];
+    const dependenciesGraph = _version().default.dependenciesGraphToSource(consumerComponent.dependenciesGraph);
+    version.dependenciesGraphRef = dependenciesGraph ? dependenciesGraph.hash() : undefined;
+    const result = [version, ...artifactObjects];
+    if (dependenciesGraph) result.push(dependenciesGraph);
+    return result;
   }
   transformArtifactsFromVinylToSource(artifactsFiles) {
     const artifacts = [];