@teambit/snapping 1.0.102 → 1.0.104

package/dist/snapping.main.runtime.js

@@ -256,6 +256,13 @@ function _exceptions() {
   };
   return data;
 }
+function _dependencies() {
+  const data = _interopRequireDefault(require("@teambit/dependencies"));
+  _dependencies = function () {
+    return data;
+  };
+  return data;
+}
 function _sources() {
   const data = require("@teambit/legacy/dist/consumer/component/sources");
   _sources = function () {
@@ -319,6 +326,13 @@ function _snapFromScope() {
   };
   return data;
 }
+function _generateCompFromScope() {
+  const data = require("./generate-comp-from-scope");
+  _generateCompFromScope = function () {
+    return data;
+  };
+  return data;
+}
 function _flattenedEdges() {
   const data = require("./flattened-edges");
   _flattenedEdges = function () {
@@ -336,7 +350,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const HooksManagerInstance = _hooks().default.getInstance();
 class SnappingMain {
-  constructor(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer) {
+  constructor(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps) {
     var _this$scope;
     this.workspace = workspace;
     this.logger = logger;
@@ -347,6 +361,7 @@ class SnappingMain {
     this.exporter = exporter;
     this.builder = builder;
     this.importer = importer;
+    this.deps = deps;
     _defineProperty(this, "objectsRepo", void 0);
     this.objectsRepo = (_this$scope = this.scope) === null || _this$scope === void 0 || (_this$scope = _this$scope.legacyScope) === null || _this$scope === void 0 ? void 0 : _this$scope.objects;
   }
@@ -376,6 +391,7 @@ class SnappingMain {
     soft = false,
     persist = false,
     ignoreBuildErrors = false,
+    rebuildDepsGraph,
     incrementBy = 1,
     disableTagAndSnapPipelines = false,
     failFast = false
@@ -432,6 +448,7 @@ class SnappingMain {
       persist,
       disableTagAndSnapPipelines,
       ignoreBuildErrors,
+      rebuildDepsGraph,
       incrementBy,
       packageManagerConfigRootDir: this.workspace.path,
       dependencyResolver: this.dependencyResolver,
@@ -564,11 +581,22 @@ if you're willing to lose the history from the head to the specified version, us
         dependencies: snapData.dependencies ? await this.scope.resolveMultipleComponentIds(snapData.dependencies) : [],
         aspects: snapData.aspects,
         message: snapData.message,
-        files: snapData.files
+        files: snapData.files,
+        isNew: snapData.isNew,
+        mainFile: snapData.mainFile,
+        newDependencies: (snapData.newDependencies || []).map(dep => ({
+          id: dep.id,
+          version: dep.version,
+          isComponent: dep.isComponent ?? true,
+          type: dep.type ?? 'runtime'
+        }))
       };
     }));
-    const componentIds = snapDataPerComp.map(t => t.componentId);
+    const componentIds = (0, _lodash().compact)(snapDataPerComp.map(t => t.isNew ? null : t.componentId));
+    const allCompIds = snapDataPerComp.map(s => s.componentId);
     const componentIdsLatest = componentIds.map(id => id.changeVersion(_constants().LATEST));
+    const newCompsData = (0, _lodash().compact)(snapDataPerComp.map(t => t.isNew ? t : null));
+    const newComponents = await Promise.all(newCompsData.map(newComp => (0, _generateCompFromScope().generateCompFromScope)(this.scope, newComp)));
     let lane;
     const laneIdStr = params.lane;
     if (laneIdStr) {
@@ -584,15 +612,22 @@ if you're willing to lose the history from the head to the specified version, us
       lane,
       reason: `seeders to snap`
     });
-    const components = await this.scope.getMany(componentIdsLatest);
-    await Promise.all(components.map(async comp => {
-      var _snapData$files;
+    const getSnapData = id => {
       const snapData = snapDataPerComp.find(t => {
-        return t.componentId.isEqual(comp.id, {
+        return t.componentId.isEqual(id, {
           ignoreVersion: true
         });
       });
-      if (!snapData) throw new Error(`unable to find ${comp.id.toString()} in snapDataPerComp`);
+      if (!snapData) throw new Error(`unable to find ${id.toString()} in snapDataPerComp`);
+      return snapData;
+    };
+    const existingComponents = await this.scope.getMany(componentIdsLatest);
+    const components = [...existingComponents, ...newComponents];
+    // for new components these are not needed. coz when generating them we already add the aspects and the files.
+    // the dependencies are calculated later and they're provided by "newDependencies" prop (not "dependencies").
+    await Promise.all(existingComponents.map(async comp => {
+      var _snapData$files;
+      const snapData = getSnapData(comp.id);
       if (snapData.aspects) await this.scope.addAspectsFromConfigObject(comp, snapData.aspects);
       if (snapData.dependencies.length) {
         await this.updateDependenciesVersionsOfComponent(comp, snapData.dependencies, componentIds);
@@ -601,8 +636,18 @@ if you're willing to lose the history from the head to the specified version, us
         await this.updateSourceFiles(comp, snapData.files);
       }
     }));
+    await (0, _pMapSeries().default)(components, async comp => this.scope.executeOnCompAspectReCalcSlot(comp));
+
+    // run this for new components only.
+    // otherwise, running this for existing components, will override the existing dependencies unexpectedly.
+    // if this is needed for existing components, see how to merge the model data.
+    await (0, _pMapSeries().default)(newComponents, async component => {
+      const snapData = getSnapData(component.id);
+      // adds explicitly defined dependencies and dependencies from envs/aspects (overrides)
+      await (0, _generateCompFromScope().addDeps)(component, snapData, this.scope, this.deps, this.dependencyResolver);
+    });
     const consumerComponents = components.map(c => c.state._consumer);
-    const legacyIds = _componentId().ComponentIdList.fromArray(componentIds.map(id => id));
+    const ids = _componentId().ComponentIdList.fromArray(allCompIds);
     const results = await (0, _tagModelComponent().tagModelComponent)(_objectSpread(_objectSpread({}, params), {}, {
       scope: this.scope,
       consumerComponents,
@@ -613,7 +658,7 @@ if you're willing to lose the history from the head to the specified version, us
       skipAutoTag: true,
       persist: true,
       isSnap: true,
-      ids: legacyIds,
+      ids,
       message: params.message
     }));
     const {
@@ -626,8 +671,8 @@ if you're willing to lose the history from the head to the specified version, us
         exported
       } = await this.exporter.exportMany({
         scope: this.scope.legacyScope,
-        ids: legacyIds,
-        idsWithFutureScope: legacyIds,
+        ids,
+        idsWithFutureScope: ids,
         allVersions: false,
         laneObject: updatedLane || undefined,
         // no need other snaps. only the latest one. without this option, when snapping on lane from another-scope, it
@@ -660,6 +705,7 @@ if you're willing to lose the history from the head to the specified version, us
     build,
     disableTagAndSnapPipelines = false,
     ignoreBuildErrors = false,
+    rebuildDepsGraph,
     unmodified = false,
     exitOnFirstFailedTask = false
   }) {
@@ -697,6 +743,7 @@ if you're willing to lose the history from the head to the specified version, us
       isSnap: true,
       disableTagAndSnapPipelines,
       ignoreBuildErrors,
+      rebuildDepsGraph,
       packageManagerConfigRootDir: this.workspace.path,
       dependencyResolver: this.dependencyResolver,
       exitOnFirstFailedTask
@@ -807,7 +854,7 @@ there are matching among unmodified components thought. consider using --unmodif
     await this.workspace.bitMap.write(`reset (never-exported)`);
     return notExported;
   }
-  async _addFlattenedDependenciesToComponents(components) {
+  async _addFlattenedDependenciesToComponents(components, rebuildDepsGraph = false) {
     _loader().default.start('importing missing dependencies...');
     const getLane = async () => {
       const lane = await this.scope.legacyScope.getCurrentLaneObject();
@@ -824,8 +871,7 @@ there are matching among unmodified components thought. consider using --unmodif
     await flattenedDependenciesGetter.populateFlattenedDependencies();
     _loader().default.stop();
     await this._addFlattenedDepsGraphToComponents(components);
-    const buildGraphFromHistoricFlattenedEdges = Boolean(process.env.BIT_BUILD_GRAPH_FROM_HISTORIC_FLATTENED_EDGES);
-    if (!buildGraphFromHistoricFlattenedEdges) return;
+    if (rebuildDepsGraph) return;
     components.forEach(component => {
       const graphFromIds = graphIds.successorsSubgraph(component.id.toString());
       const edgesFromGraph = graphFromIds.edges.map(edge => {
@@ -861,7 +907,10 @@ there are matching among unmodified components thought. consider using --unmodif
         msg += `the following flattened deps exist in the fetched deps but not in the graph:\n${flattenedOnlyInFetched.join(', ')}\n`;
       }
       if (msg) {
-        throw new Error(`edges mismatch for ${component.id.toString()}:\n${msg}`);
+        throw new Error(`edges mismatch for ${component.id.toString()}:
+${msg}
+please report this error to the support team.
+to be able to continue without this error, re-run the command with "--rebuild-deps-graph" flag.`);
       }
     });
   }
@@ -1242,14 +1291,14 @@ another option, in case this dependency is not in main yet is to remove all refe
     const data = {
       dependencies: dependenciesListSerialized
     };
-    const existingExtension = component.state._consumer.extensions.findExtension(extId);
+    const existingExtension = component.config.extensions.findExtension(extId);
     if (existingExtension) {
       // Only merge top level of extension data
       Object.assign(existingExtension.data, data);
       return;
     }
     const extension = new (_config().ExtensionDataEntry)(undefined, undefined, extId, undefined, data);
-    component.state._consumer.extensions.push(extension);
+    component.config.extensions.push(extension);
   }
   async getComponentsToTag(includeUnmodified, exactVersion, persist, ids, snapped, unmerged) {
     const warnings = [];
@@ -1310,9 +1359,9 @@ another option, in case this dependency is not in main yet is to remove all refe
       warnings
     };
   }
-  static async provider([workspace, cli, loggerMain, issues, insights, dependencyResolver, scope, exporter, builder, importer, globalConfig]) {
+  static async provider([workspace, cli, loggerMain, issues, insights, dependencyResolver, scope, exporter, builder, importer, globalConfig, deps]) {
     const logger = loggerMain.createLogger(_snapping().SnappingAspect.id);
-    const snapping = new SnappingMain(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer);
+    const snapping = new SnappingMain(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps);
     const snapCmd = new (_snapCmd().SnapCmd)(snapping, logger, globalConfig);
     const tagCmd = new (_tagCmd().TagCmd)(snapping, logger, globalConfig);
     const tagFromScopeCmd = new (_tagFromScope().TagFromScopeCmd)(snapping, logger);
@@ -1324,7 +1373,7 @@ another option, in case this dependency is not in main yet is to remove all refe
 }
 exports.SnappingMain = SnappingMain;
 _defineProperty(SnappingMain, "slots", []);
-_defineProperty(SnappingMain, "dependencies", [_workspace().default, _cli().CLIAspect, _logger().LoggerAspect, _issues().default, _insights().InsightsAspect, _dependencyResolver().DependencyResolverAspect, _scope().ScopeAspect, _export().ExportAspect, _builder().BuilderAspect, _importer().default, _globalConfig().default]);
+_defineProperty(SnappingMain, "dependencies", [_workspace().default, _cli().CLIAspect, _logger().LoggerAspect, _issues().default, _insights().InsightsAspect, _dependencyResolver().DependencyResolverAspect, _scope().ScopeAspect, _export().ExportAspect, _builder().BuilderAspect, _importer().default, _globalConfig().default, _dependencies().default]);
 _defineProperty(SnappingMain, "runtime", _cli().MainRuntime);
 _snapping().SnappingAspect.addRuntime(SnappingMain);
 var _default = exports.default = SnappingMain;