@teambit/snapping 1.0.454 → 1.0.456

package/dist/snapping.main.runtime.js

@@ -18,6 +18,13 @@ function _graph() {
   };
   return data;
 }
+function _fsExtra() {
+  const data = _interopRequireDefault(require("fs-extra"));
+  _fsExtra = function () {
+    return data;
+  };
+  return data;
+}
 function _getFlattenedDependencies() {
   const data = require("@teambit/legacy/dist/scope/component-ops/get-flattened-dependencies");
   _getFlattenedDependencies = function () {
@@ -333,20 +340,6 @@ function _lanesModules() {
   };
   return data;
 }
-function _forking() {
-  const data = require("@teambit/forking");
-  _forking = function () {
-    return data;
-  };
-  return data;
-}
-function _install() {
-  const data = require("@teambit/install");
-  _install = function () {
-    return data;
-  };
-  return data;
-}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -354,7 +347,7 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class SnappingMain {
-  constructor(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps, application, forking, install) {
+  constructor(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps, application) {
     this.workspace = workspace;
     this.logger = logger;
     this.issues = issues;
@@ -366,8 +359,6 @@ class SnappingMain {
     this.importer = importer;
     this.deps = deps;
     this.application = application;
-    this.forking = forking;
-    this.install = install;
     _defineProperty(this, "objectsRepo", void 0);
     this.objectsRepo = this.scope?.legacyScope?.objects;
   }
@@ -434,10 +425,7 @@ class SnappingMain {
       stagedConfig,
       removedComponents
     } = await (0, _tagModelComponent().tagModelComponent)({
-      workspace: this.workspace,
-      scope: this.scope,
       snapping: this,
-      builder: this.builder,
       consumerComponents,
       ids: compIds,
       message,
@@ -457,7 +445,6 @@ class SnappingMain {
       rebuildDepsGraph,
       incrementBy,
       packageManagerConfigRootDir: this.workspace.path,
-      dependencyResolver: this.dependencyResolver,
       exitOnFirstFailedTask: failFast
     });
     const tagResults = {
@@ -537,15 +524,12 @@ 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), {}, {
-      scope: this.scope,
       consumerComponents,
       tagDataPerComp,
       populateArtifactsFrom: shouldUsePopulateArtifactsFrom ? components.map(c => c.id) : undefined,
       populateArtifactsIgnorePkgJson: params.ignoreLastPkgJson,
       copyLogFromPreviousSnap: true,
       snapping: this,
-      builder: this.builder,
-      dependencyResolver: this.dependencyResolver,
       skipAutoTag: true,
       persist: true,
       ids: componentIds,
@@ -579,174 +563,7 @@ if you're willing to lose the history from the head to the specified version, us
       newComponents: new (_componentId().ComponentIdList)()
     };
   }
-  async forkAndSnap(snapDataPerCompRaw, params) {
-    const allAreForkedFrom = snapDataPerCompRaw.every(s => s.forkFrom);
-    if (!allAreForkedFrom) {
-      throw new (_bitError().BitError)(`when forkedFrom prop is used, all components must have the forkedFrom prop`);
-    }
-    let lane;
-    const laneIdStr = params.lane;
-    if (laneIdStr) {
-      const laneId = _laneId().LaneId.parse(laneIdStr);
-      try {
-        lane = await this.importer.importLaneObject(laneId);
-      } catch (err) {
-        if (err.constructor.name !== _legacy2().LaneNotFound.name) throw err;
-        // if the lane is not found, it's probably because it's new. create a new lane.
-        lane = await (0, _lanesModules().createLane)(this.workspace, laneId.name, laneId.scope);
-      }
-    }
-    const snapDataPerComp = snapDataPerCompRaw.map(snapData => {
-      return {
-        componentId: _componentId().ComponentID.fromString(snapData.componentId),
-        dependencies: snapData.dependencies || [],
-        aspects: snapData.aspects,
-        message: snapData.message,
-        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'
-        })),
-        removeDependencies: snapData.removeDependencies,
-        forkFrom: _componentId().ComponentID.fromString(snapData.forkFrom),
-        version: snapData.version
-      };
-    });
-
-    // console.log('snapDataPerComp', JSON.stringify(snapDataPerComp, undefined, 2));
-
-    const allCompIds = snapDataPerComp.map(s => s.componentId);
-    const forkedFromData = (0, _lodash().compact)(snapDataPerComp.map(t => t.forkFrom ? t : null));
-    const forkMultipleData = forkedFromData.map(f => ({
-      sourceId: f.forkFrom.toString(),
-      targetId: f.componentId.fullName,
-      targetScope: f.componentId.scope
-    }));
-    const forkResults = await this.forking.forkMultipleFromRemote(forkMultipleData, {
-      refactor: true
-    });
-    const newEnvData = {};
-    forkedFromData.forEach(f => {
-      const bitmapElem = this.workspace.bitMap.getBitmapEntry(f.componentId);
-      // @ts-ignore
-      const env = bitmapElem?.config?.['teambit.envs/envs'].env;
-      if (!env) return;
-      const found = forkedFromData.find(fo => fo.forkFrom?.toStringWithoutVersion() === env);
-      if (!found) return;
-      const newEnvStr = found.componentId.toString();
-      if (!newEnvData[newEnvStr]) newEnvData[newEnvStr] = [];
-      newEnvData[newEnvStr].push(f.componentId);
-    });
-    await (0, _pMapSeries().default)(Object.entries(newEnvData), async ([env, compIds]) => {
-      await this.workspace.setEnvToComponents(_componentId().ComponentID.fromString(env), compIds, false);
-    });
-    const getSnapData = id => {
-      const snapData = snapDataPerComp.find(t => {
-        return t.componentId.isEqual(id, {
-          ignoreVersion: true
-        });
-      });
-      if (!snapData) throw new Error(`unable to find ${id.toString()} in snapDataPerComp`);
-      return snapData;
-    };
-    const newForkedComponents = await this.workspace.getMany(forkResults.map(f => f.targetCompId));
-    await Promise.all(newForkedComponents.map(async comp => {
-      const snapData = getSnapData(comp.id);
-      if (snapData.files?.length) {
-        await this.updateSourceFiles(comp, snapData.files);
-        await this.workspace.write(comp);
-      }
-      if (snapData.aspects) {
-        const bitmapElem = this.workspace.bitMap.getBitmapEntry(comp.id);
-        if (!bitmapElem) throw new Error(`unable to find ${comp.id.toString()} in the bitmap`);
-        const currentConfig = bitmapElem.config;
-        if (!currentConfig) {
-          this.workspace.bitMap.setEntireConfig(comp.id, snapData.aspects);
-          return;
-        }
-        const currentEnvSettings = currentConfig['teambit.envs/envs'];
-        const currentEnv = currentEnvSettings !== '-' && currentEnvSettings.env;
-        const newEnv = snapData.aspects['teambit.envs/envs']?.env;
-        if (!currentEnv || !newEnv) {
-          this.workspace.bitMap.setEntireConfig(comp.id, _objectSpread(_objectSpread({}, currentConfig), snapData.aspects));
-          return;
-        }
-        const currentEnvWithPotentialVer = Object.keys(currentConfig).find(c => c === currentEnv || c.startsWith(`${currentEnv}@`));
-        if (currentEnvWithPotentialVer) delete currentConfig[currentEnvWithPotentialVer];
-        delete currentConfig['teambit.envs/envs'];
-        this.workspace.bitMap.setEntireConfig(comp.id, _objectSpread(_objectSpread({}, currentConfig), snapData.aspects));
-      }
-    }));
-    await this.workspace.bitMap.write();
-    // if you don't clear the cache here, the installation assumes all components have the old env.
-    await this.workspace.clearCache();
-    await this.install.install(undefined, {
-      dedupe: true,
-      import: false,
-      copyPeerToRuntimeOnRoot: true,
-      copyPeerToRuntimeOnComponents: false,
-      updateExisting: false
-    });
-    // if we don't clear the cache here, the "build" process during tag doesn't install the necessary packages
-    // on the capsules.
-    await this.workspace.clearCache();
-    const components = await this.workspace.getMany(forkedFromData.map(f => f.componentId));
-    const consumerComponents = components.map(c => c.state._consumer);
-    const ids = _componentId().ComponentIdList.fromArray(allCompIds);
-    await this.throwForVariousIssues(components, params.ignoreIssues);
-    const shouldTag = Boolean(params.tag);
-    const results = await (0, _tagModelComponent().tagModelComponent)(_objectSpread(_objectSpread({}, params), {}, {
-      scope: this.scope,
-      consumerComponents,
-      tagDataPerComp: snapDataPerComp.map(s => ({
-        componentId: s.componentId,
-        message: s.message,
-        dependencies: [],
-        versionToTag: shouldTag ? s.version || 'patch' : undefined
-      })),
-      snapping: this,
-      builder: this.builder,
-      dependencyResolver: this.dependencyResolver,
-      skipAutoTag: true,
-      persist: true,
-      isSnap: !shouldTag,
-      ids,
-      message: params.message,
-      updateDependentsOnLane: params.updateDependents
-    }));
-    const {
-      taggedComponents
-    } = results;
-    let exportedIds;
-    if (params.push) {
-      const updatedLane = lane ? await this.scope.legacyScope.loadLane(lane.toLaneId()) : undefined;
-      const {
-        exported
-      } = await this.exporter.exportMany({
-        scope: this.scope.legacyScope,
-        ids,
-        allVersions: false,
-        laneObject: updatedLane,
-        // no need other snaps. only the latest one. without this option, when snapping on lane from another-scope, it
-        // may throw an error saying the previous snaps don't exist on the filesystem.
-        // (see the e2e - "snap on a lane when the component is new to the lane and the scope")
-        exportHeadsOnly: true
-      });
-      exportedIds = exported;
-    }
-    return {
-      snappedComponents: taggedComponents,
-      snappedIds: taggedComponents.map(comp => comp.id),
-      exportedIds
-    };
-  }
   async snapFromScope(snapDataPerCompRaw, params) {
-    const hasForkedFrom = snapDataPerCompRaw.some(s => s.forkFrom);
-    if (hasForkedFrom) return this.forkAndSnap(snapDataPerCompRaw, params);
     if (this.workspace) {
       throw new (_bitError().BitError)(`unable to run this command from a workspace, please create a new bare-scope and run it from there`);
     }
@@ -857,7 +674,6 @@ 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), {}, {
-      scope: this.scope,
       consumerComponents,
       tagDataPerComp: snapDataPerComp.map(s => ({
         componentId: s.componentId,
@@ -866,8 +682,6 @@ if you're willing to lose the history from the head to the specified version, us
         versionToTag: shouldTag ? s.version || 'patch' : undefined
       })),
       snapping: this,
-      builder: this.builder,
-      dependencyResolver: this.dependencyResolver,
       skipAutoTag: true,
       persist: true,
       isSnap: !shouldTag,
@@ -943,10 +757,7 @@ if you're willing to lose the history from the head to the specified version, us
       stagedConfig,
       removedComponents
     } = await (0, _tagModelComponent().tagModelComponent)({
-      workspace: this.workspace,
-      scope: this.scope,
       snapping: this,
-      builder: this.builder,
       editor,
       consumerComponents,
       ids,
@@ -963,7 +774,6 @@ if you're willing to lose the history from the head to the specified version, us
       ignoreBuildErrors,
       rebuildDepsGraph,
       packageManagerConfigRootDir: this.workspace.path,
-      dependencyResolver: this.dependencyResolver,
       exitOnFirstFailedTask
     });
     const snapResults = {
@@ -1411,7 +1221,12 @@ another option, in case this dependency is not in main yet is to remove all refe
     const currentFiles = component.state.filesystem.files;
     files.forEach(file => {
       if (file.delete) {
-        const index = currentFiles.findIndex(f => f.path === file.path);
+        const found = currentFiles.find(f => f.relative === file.path);
+        if (!found) return;
+        if (this.workspace) {
+          _fsExtra().default.removeSync(found.path);
+        }
+        const index = currentFiles.findIndex(f => f.relative === file.path);
         if (index !== -1) {
           currentFiles.splice(index, 1);
         }
@@ -1563,9 +1378,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, deps, application, forking, install]) {
+  static async provider([workspace, cli, loggerMain, issues, insights, dependencyResolver, scope, exporter, builder, importer, globalConfig, deps, application]) {
     const logger = loggerMain.createLogger(_snapping().SnappingAspect.id);
-    const snapping = new SnappingMain(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps, application, forking, install);
+    const snapping = new SnappingMain(workspace, logger, issues, insights, dependencyResolver, scope, exporter, builder, importer, deps, application);
     const snapCmd = new (_snapCmd().SnapCmd)(snapping, logger, globalConfig);
     const tagCmd = new (_tagCmd().TagCmd)(snapping, logger, globalConfig);
     const tagFromScopeCmd = new (_tagFromScope().TagFromScopeCmd)(snapping, logger);
@@ -1578,7 +1393,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().WorkspaceAspect, _cli().CLIAspect, _logger().LoggerAspect, _issues().IssuesAspect, _insights().InsightsAspect, _dependencyResolver().DependencyResolverAspect, _scope().ScopeAspect, _export().ExportAspect, _builder().BuilderAspect, _importer().ImporterAspect, _globalConfig().GlobalConfigAspect, _dependencies().DependenciesAspect, _application().ApplicationAspect, _forking().ForkingAspect, _install().InstallAspect]);
+_defineProperty(SnappingMain, "dependencies", [_workspace().WorkspaceAspect, _cli().CLIAspect, _logger().LoggerAspect, _issues().IssuesAspect, _insights().InsightsAspect, _dependencyResolver().DependencyResolverAspect, _scope().ScopeAspect, _export().ExportAspect, _builder().BuilderAspect, _importer().ImporterAspect, _globalConfig().GlobalConfigAspect, _dependencies().DependenciesAspect, _application().ApplicationAspect]);
 _defineProperty(SnappingMain, "runtime", _cli().MainRuntime);
 _snapping().SnappingAspect.addRuntime(SnappingMain);
 var _default = exports.default = SnappingMain;