@teambit/importer 0.0.307 → 0.0.309

package/dist/fetch-cmd.js

@@ -31,16 +31,6 @@ function _chalk() {
   return data;
 }
 
-function _ramda() {
-  const data = _interopRequireDefault(require("ramda"));
-
-  _ramda = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _mergeVersion() {
   const data = require("@teambit/legacy/dist/consumer/versions-ops/merge-version/merge-version");
 
@@ -70,7 +60,7 @@ class FetchCmd {
     fromOriginalScope = false
   }) {
     const {
-      dependencies,
+      importedIds,
       importDetails
     } = await this.importer.fetch(ids, lanes, components, fromOriginalScope);
 
@@ -80,16 +70,12 @@ class FetchCmd {
       }, null, 4);
     }
 
-    if (dependencies && !_ramda().default.isEmpty(dependencies)) {
-      const componentsObj = dependencies.map(_ramda().default.prop('component'));
-      const title = componentsObj.length === 1 ? 'successfully fetched one component' : `successfully fetched ${componentsObj.length} components`;
-      const componentDependencies = componentsObj.map(component => {
-        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-        const details = importDetails.find(c => c.id === component.id.toStringWithoutVersion()); // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-
-        if (!details) throw new Error(`missing details of component ${component.id.toString()}`); // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-
-        return formatPlainComponentItemWithVersions(component, details);
+    if (importedIds.length) {
+      const title = importedIds.length === 1 ? 'successfully fetched one component' : `successfully fetched ${importedIds.length} components`;
+      const componentDependencies = importedIds.map(id => {
+        const details = importDetails.find(c => c.id === id.toStringWithoutVersion());
+        if (!details) throw new Error(`missing details of component ${id.toString()}`);
+        return formatPlainComponentItemWithVersions(id, details);
       });
       const componentDependenciesOutput = [_chalk().default.green(title)].concat(componentDependencies).join('\n');
       return componentDependenciesOutput;
@@ -102,12 +88,11 @@ class FetchCmd {
 
 exports.FetchCmd = FetchCmd;
 
-function formatPlainComponentItemWithVersions(component, importDetails) {
+function formatPlainComponentItemWithVersions(bitId, importDetails) {
   const status = importDetails.status;
-  const id = component.id.toStringWithoutVersion();
-  const versions = importDetails.versions.length ? `new versions: ${importDetails.versions.join(', ')}` : ''; // $FlowFixMe component.version should be set here
-
-  const usedVersion = status === 'added' ? `, currently used version ${component.version}` : '';
+  const id = bitId.toStringWithoutVersion();
+  const versions = importDetails.versions.length ? `new versions: ${importDetails.versions.join(', ')}` : '';
+  const usedVersion = status === 'added' ? `, currently used version ${bitId.version}` : '';
 
   const getConflictMessage = () => {
     if (!importDetails.filesStatus) return '';

package/dist/fetch-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["FetchCmd","constructor","importer","report","ids","lanes","components","json","fromOriginalScope","dependencies","importDetails","fetch","JSON","stringify","R","isEmpty","componentsObj","map","prop","title","length","componentDependencies","component","details","find","c","id","toStringWithoutVersion","Error","toString","formatPlainComponentItemWithVersions","componentDependenciesOutput","chalk","green","concat","join","yellow","status","versions","usedVersion","version","getConflictMessage","filesStatus","conflictedFiles","Object","keys","filter","file","FileStatus","manual","bold","deprecated","missingDeps","red","d","cyan"],"sources":["fetch-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport R from 'ramda';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { FileStatus } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/merge-version';\nimport { ImporterMain } from './importer.main.runtime';\nimport { ImportDetails, ImportStatus } from './import-components';\n\nexport class FetchCmd implements Command {\n  name = 'fetch [ids...]';\n  description = `fetch remote objects and store locally`;\n  extendedDescription = `for lanes, use \"/\" as a separator between the remote and the lane name, e.g. teambit.ui/fix-button`;\n  alias = '';\n  private = true;\n  options = [\n    [\n      'l',\n      'lanes',\n      'EXPERIMENTAL. fetch component objects from lanes. note, it does not save the remote lanes objects locally, only the refs',\n    ],\n    ['c', 'components', 'fetch components'],\n    ['j', 'json', 'return the output as JSON'],\n    [\n      '',\n      'from-original-scopes',\n      'fetch indirect dependencies from their original scope as opposed to from their dependents',\n    ],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private importer: ImporterMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      lanes = false,\n      components = false,\n      json = false,\n      fromOriginalScope = false,\n    }: {\n      lanes?: boolean;\n      components?: boolean;\n      json?: boolean;\n      fromOriginalScope?: boolean;\n    }\n  ) {\n    const { dependencies, importDetails } = await this.importer.fetch(ids, lanes, components, fromOriginalScope);\n    if (json) {\n      return JSON.stringify({ importDetails }, null, 4);\n    }\n    if (dependencies && !R.isEmpty(dependencies)) {\n      const componentsObj = dependencies.map(R.prop('component'));\n      const title =\n        componentsObj.length === 1\n          ? 'successfully fetched one component'\n          : `successfully fetched ${componentsObj.length} components`;\n      const componentDependencies = componentsObj.map((component) => {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        const details = importDetails.find((c) => c.id === component.id.toStringWithoutVersion());\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        if (!details) throw new Error(`missing details of component ${component.id.toString()}`);\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        return formatPlainComponentItemWithVersions(component, details);\n      });\n      const componentDependenciesOutput = [chalk.green(title)].concat(componentDependencies).join('\\n');\n\n      return componentDependenciesOutput;\n    }\n    return chalk.yellow('nothing to import');\n  }\n}\n\nfunction formatPlainComponentItemWithVersions(component: Component, importDetails: ImportDetails) {\n  const status: ImportStatus = importDetails.status;\n  const id = component.id.toStringWithoutVersion();\n  const versions = importDetails.versions.length ? `new versions: ${importDetails.versions.join(', ')}` : '';\n  // $FlowFixMe component.version should be set here\n  const usedVersion = status === 'added' ? `, currently used version ${component.version}` : '';\n  const getConflictMessage = () => {\n    if (!importDetails.filesStatus) return '';\n    const conflictedFiles = Object.keys(importDetails.filesStatus) // $FlowFixMe file is set\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      .filter((file) => importDetails.filesStatus[file] === FileStatus.manual);\n    if (!conflictedFiles.length) return '';\n    return `(the following files were saved with conflicts ${conflictedFiles\n      .map((file) => chalk.bold(file))\n      .join(', ')}) `;\n  };\n  const deprecated = importDetails.deprecated ? chalk.yellow('deprecated') : '';\n  const missingDeps = importDetails.missingDeps.length\n    ? chalk.red(`missing dependencies: ${importDetails.missingDeps.map((d) => d.toString()).join(', ')}`)\n    : '';\n  return `- ${chalk.green(status)} ${chalk.cyan(\n    id\n  )} ${versions}${usedVersion} ${getConflictMessage()}${deprecated} ${missingDeps}`;\n}\n"],"mappings":"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"}
+{"version":3,"names":["FetchCmd","constructor","importer","report","ids","lanes","components","json","fromOriginalScope","importedIds","importDetails","fetch","JSON","stringify","length","title","componentDependencies","map","id","details","find","c","toStringWithoutVersion","Error","toString","formatPlainComponentItemWithVersions","componentDependenciesOutput","chalk","green","concat","join","yellow","bitId","status","versions","usedVersion","version","getConflictMessage","filesStatus","conflictedFiles","Object","keys","filter","file","FileStatus","manual","bold","deprecated","missingDeps","red","d","cyan"],"sources":["fetch-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { FileStatus } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/merge-version';\nimport { ImporterMain } from './importer.main.runtime';\nimport { ImportDetails, ImportStatus } from './import-components';\n\nexport class FetchCmd implements Command {\n  name = 'fetch [ids...]';\n  description = `fetch remote objects and store locally`;\n  extendedDescription = `for lanes, use \"/\" as a separator between the remote and the lane name, e.g. teambit.ui/fix-button`;\n  alias = '';\n  private = true;\n  options = [\n    [\n      'l',\n      'lanes',\n      'EXPERIMENTAL. fetch component objects from lanes. note, it does not save the remote lanes objects locally, only the refs',\n    ],\n    ['c', 'components', 'fetch components'],\n    ['j', 'json', 'return the output as JSON'],\n    [\n      '',\n      'from-original-scopes',\n      'fetch indirect dependencies from their original scope as opposed to from their dependents',\n    ],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private importer: ImporterMain) {}\n\n  async report(\n    [ids = []]: [string[]],\n    {\n      lanes = false,\n      components = false,\n      json = false,\n      fromOriginalScope = false,\n    }: {\n      lanes?: boolean;\n      components?: boolean;\n      json?: boolean;\n      fromOriginalScope?: boolean;\n    }\n  ) {\n    const { importedIds, importDetails } = await this.importer.fetch(ids, lanes, components, fromOriginalScope);\n    if (json) {\n      return JSON.stringify({ importDetails }, null, 4);\n    }\n    if (importedIds.length) {\n      const title =\n        importedIds.length === 1\n          ? 'successfully fetched one component'\n          : `successfully fetched ${importedIds.length} components`;\n      const componentDependencies = importedIds.map((id) => {\n        const details = importDetails.find((c) => c.id === id.toStringWithoutVersion());\n        if (!details) throw new Error(`missing details of component ${id.toString()}`);\n        return formatPlainComponentItemWithVersions(id, details);\n      });\n      const componentDependenciesOutput = [chalk.green(title)].concat(componentDependencies).join('\\n');\n\n      return componentDependenciesOutput;\n    }\n    return chalk.yellow('nothing to import');\n  }\n}\n\nfunction formatPlainComponentItemWithVersions(bitId: BitId, importDetails: ImportDetails) {\n  const status: ImportStatus = importDetails.status;\n  const id = bitId.toStringWithoutVersion();\n  const versions = importDetails.versions.length ? `new versions: ${importDetails.versions.join(', ')}` : '';\n  const usedVersion = status === 'added' ? `, currently used version ${bitId.version}` : '';\n  const getConflictMessage = () => {\n    if (!importDetails.filesStatus) return '';\n    const conflictedFiles = Object.keys(importDetails.filesStatus) // $FlowFixMe file is set\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      .filter((file) => importDetails.filesStatus[file] === FileStatus.manual);\n    if (!conflictedFiles.length) return '';\n    return `(the following files were saved with conflicts ${conflictedFiles\n      .map((file) => chalk.bold(file))\n      .join(', ')}) `;\n  };\n  const deprecated = importDetails.deprecated ? chalk.yellow('deprecated') : '';\n  const missingDeps = importDetails.missingDeps.length\n    ? chalk.red(`missing dependencies: ${importDetails.missingDeps.map((d) => d.toString()).join(', ')}`)\n    : '';\n  return `- ${chalk.green(status)} ${chalk.cyan(\n    id\n  )} ${versions}${usedVersion} ${getConflictMessage()}${deprecated} ${missingDeps}`;\n}\n"],"mappings":"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"}

package/dist/import-components.d.ts

@@ -7,6 +7,9 @@ import { Lane } from '@teambit/legacy/dist/scope/models';
 import Component from '@teambit/legacy/dist/consumer/component';
 import { FilesStatus, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/merge-version';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
+import VersionDependencies from '@teambit/legacy/dist/scope/version-dependencies';
+import { GraphMain } from '@teambit/graph';
+import { Workspace } from '@teambit/workspace';
 export declare type ImportOptions = {
     ids: string[];
     verbose?: boolean;
@@ -47,31 +50,30 @@ export declare type ImportDetails = {
     removed?: boolean;
 };
 export declare type ImportResult = {
-    dependencies: ComponentWithDependencies[];
-    envComponents?: Component[];
+    importedIds: BitId[];
+    importedDeps: BitId[];
+    writtenComponents?: Component[];
     importDetails: ImportDetails[];
     cancellationMessage?: string;
 };
 export default class ImportComponents {
+    private workspace;
+    private graph;
+    options: ImportOptions;
     consumer: Consumer;
     scope: Scope;
-    options: ImportOptions;
     mergeStatus: {
         [id: string]: FilesStatus;
     };
     private laneObjects;
     private divergeData;
-    constructor(consumer: Consumer, options: ImportOptions);
+    constructor(workspace: Workspace, graph: GraphMain, options: ImportOptions);
     importComponents(): Promise<ImportResult>;
     importObjectsOnLane(): Promise<ImportResult>;
     importSpecificComponents(): Promise<ImportResult>;
     _fetchDivergeData(componentsWithDependencies: ComponentWithDependencies[]): Promise<void>;
     _throwForDivergedHistory(): void;
-    /**
-     * it can happen for example when importing a component with `--dependent` flag and the component has
-     * the same dependent with different versions. we only want the one with the higher version
-     */
-    _filterComponentsWithLowerVersions(componentsWithDependencies: ComponentWithDependencies[]): ComponentWithDependencies[];
+    private _importComponentsObjects;
     /**
      * consider the following use cases:
      * 1) no ids were provided. it should import all the lanes components objects AND main components objects
@@ -94,7 +96,7 @@ export default class ImportComponents {
     /**
      * get import details, includes the diff between the versions array before import and after import
      */
-    _getImportDetails(currentVersions: ImportedVersions, components: ComponentWithDependencies[]): Promise<ImportDetails[]>;
+    _getImportDetails(currentVersions: ImportedVersions, components: VersionDependencies[]): Promise<ImportDetails[]>;
     _throwForPotentialIssues(ids: BitIds): Promise<void>;
     _throwForModifiedOrNewComponents(ids: BitIds): Promise<void>;
     /**

package/dist/import-components.js

@@ -2,10 +2,14 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+require("core-js/modules/es.array.flat.js");
+
 require("core-js/modules/es.array.flat-map.js");
 
 require("core-js/modules/es.array.iterator.js");
 
+require("core-js/modules/es.array.unscopables.flat.js");
+
 require("core-js/modules/es.array.unscopables.flat-map.js");
 
 require("core-js/modules/es.promise.js");
@@ -45,16 +49,6 @@ function _ramda() {
   return data;
 }
 
-function _semver() {
-  const data = _interopRequireDefault(require("semver"));
-
-  _semver = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _bitError() {
   const data = require("@teambit/bit-error");
 
@@ -75,16 +69,6 @@ function _pMapSeries() {
   return data;
 }
 
-function _componentVersion() {
-  const data = require("@teambit/component-version");
-
-  _componentVersion = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _listScope() {
   const data = require("@teambit/legacy/dist/api/consumer/lib/list-scope");
 
@@ -235,19 +219,38 @@ function _manyComponentsWriter() {
   return data;
 }
 
+function _scopeComponentsImporter() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/scope/component-ops/scope-components-importer"));
+
+  _scopeComponentsImporter = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _versionDependencies() {
+  const data = require("@teambit/legacy/dist/scope/version-dependencies");
+
+  _versionDependencies = function () {
+    return data;
+  };
+
+  return data;
+}
+
 class ImportComponents {
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-  // @ts-ignore
-  constructor(consumer, options) {
+  constructor(workspace, graph, options) {
+    this.workspace = workspace;
+    this.graph = graph;
+    this.options = options;
     (0, _defineProperty2().default)(this, "consumer", void 0);
     (0, _defineProperty2().default)(this, "scope", void 0);
-    (0, _defineProperty2().default)(this, "options", void 0);
     (0, _defineProperty2().default)(this, "mergeStatus", void 0);
     (0, _defineProperty2().default)(this, "laneObjects", void 0);
     (0, _defineProperty2().default)(this, "divergeData", []);
-    this.consumer = consumer;
-    this.scope = consumer.scope;
-    this.options = options;
+    this.consumer = this.workspace.consumer;
+    this.scope = this.consumer.scope;
     this.laneObjects = this.options.lanes ? this.options.lanes.lanes : [];
   }
 
@@ -280,7 +283,7 @@ class ImportComponents {
     const bitIds = await this.getBitIds();
     lane ? _logger().default.debug(`importObjectsOnLane, Lane: ${lane.id()}, Ids: ${bitIds.toString()}`) : _logger().default.debug(`importObjectsOnLane, the lane does not exist on the remote. importing only the main components`);
     const beforeImportVersions = await this._getCurrentVersions(bitIds);
-    const componentsWithDependencies = await this.consumer.importComponentsObjects(bitIds, {
+    const versionDependenciesArr = await this._importComponentsObjects(bitIds, {
       allHistory: this.options.allHistory,
       lane
     }); // import lane components from their original scope, this way, it's possible to run diff/merge on them.
@@ -294,7 +297,7 @@ class ImportComponents {
       // scope and once from the lane-scope.
       const mainIdsLatest = _bitId().BitIds.fromArray(lane.toBitIds().map(m => m.changeVersion(undefined)));
 
-      await this.consumer.importComponentsObjects(mainIdsLatest, {
+      await this._importComponentsObjects(mainIdsLatest, {
         allHistory: this.options.allHistory,
         ignoreMissingHead: true
       });
@@ -304,29 +307,25 @@ class ImportComponents {
     const mergeAllLanesResults = await (0, _pMapSeries().default)(this.laneObjects, laneObject => this.scope.sources.mergeLane(laneObject, true));
     const mergedLanes = mergeAllLanesResults.map(result => result.mergeLane);
     await Promise.all(mergedLanes.map(mergedLane => this.scope.lanes.saveLane(mergedLane)));
-
-    const componentsWithDependenciesFiltered = this._filterComponentsWithLowerVersions(componentsWithDependencies);
-
-    await this._fetchDivergeData(componentsWithDependenciesFiltered);
-
-    this._throwForDivergedHistory();
-
-    await this._writeToFileSystem(componentsWithDependenciesFiltered);
-    await this._saveLaneDataIfNeeded(componentsWithDependenciesFiltered);
-    const importDetails = await this._getImportDetails(beforeImportVersions, componentsWithDependencies);
+    const importDetails = await this._getImportDetails(beforeImportVersions, versionDependenciesArr);
     return {
-      dependencies: componentsWithDependenciesFiltered,
+      importedIds: versionDependenciesArr.map(v => v.component.id).flat(),
+      importedDeps: versionDependenciesArr.map(v => v.allDependenciesIds).flat(),
       importDetails
     };
   }
 
   async importSpecificComponents() {
+    var _this$laneObjects;
+
     _logger().default.debug(`importSpecificComponents, Ids: ${this.options.ids.join(', ')}`);
 
     const bitIds = await this.getBitIds();
     const beforeImportVersions = await this._getCurrentVersions(bitIds);
     await this._throwForPotentialIssues(bitIds);
-    const componentsWithDependencies = await this.consumer.importComponentsHarmony(bitIds, true, this.laneObjects);
+    const versionDependenciesArr = await this._importComponentsObjects(bitIds, {
+      lane: (_this$laneObjects = this.laneObjects) === null || _this$laneObjects === void 0 ? void 0 : _this$laneObjects[0]
+    });
 
     if (this.laneObjects && this.options.objectsOnly) {
       // merge the lane objects
@@ -335,17 +334,24 @@ class ImportComponents {
       await Promise.all(mergedLanes.map(mergedLane => this.scope.lanes.saveLane(mergedLane)));
     }
 
-    const componentsWithDependenciesFiltered = this._filterComponentsWithLowerVersions(componentsWithDependencies);
+    let writtenComponents = [];
 
-    await this._fetchDivergeData(componentsWithDependenciesFiltered);
+    if (!this.options.objectsOnly) {
+      const componentsWithDependencies = await (0, _versionDependencies().multipleVersionDependenciesToConsumer)(versionDependenciesArr, this.scope.objects);
+      await this._fetchDivergeData(componentsWithDependencies);
 
-    this._throwForDivergedHistory();
+      this._throwForDivergedHistory();
 
-    await this._writeToFileSystem(componentsWithDependenciesFiltered);
-    await this._saveLaneDataIfNeeded(componentsWithDependenciesFiltered);
-    const importDetails = await this._getImportDetails(beforeImportVersions, componentsWithDependencies);
+      await this._writeToFileSystem(componentsWithDependencies);
+      await this._saveLaneDataIfNeeded(componentsWithDependencies);
+      writtenComponents = componentsWithDependencies.map(c => c.component);
+    }
+
+    const importDetails = await this._getImportDetails(beforeImportVersions, versionDependenciesArr);
     return {
-      dependencies: componentsWithDependenciesFiltered,
+      importedIds: versionDependenciesArr.map(v => v.component.id).flat(),
+      importedDeps: versionDependenciesArr.map(v => v.allDependenciesIds).flat(),
+      writtenComponents,
       importDetails
     };
   }
@@ -379,17 +385,25 @@ class ImportComponents {
       throw new (_componentsPendingMerge().default)(divergeData);
     }
   }
-  /**
-   * it can happen for example when importing a component with `--dependent` flag and the component has
-   * the same dependent with different versions. we only want the one with the higher version
-   */
 
+  async _importComponentsObjects(ids, {
+    fromOriginalScope = false,
+    allHistory = false,
+    lane,
+    ignoreMissingHead = false
+  }) {
+    const scopeComponentsImporter = _scopeComponentsImporter().default.getInstance(this.scope);
 
-  _filterComponentsWithLowerVersions(componentsWithDependencies) {
-    return componentsWithDependencies.filter(comp => {
-      const sameIdHigherVersion = componentsWithDependencies.find(c => !c.component.id.isEqual(comp.component.id) && c.component.id.isEqualWithoutVersion(comp.component.id) && (0, _componentVersion().isTag)(c.component.id.version) && (0, _componentVersion().isTag)(comp.component.id.version) && _semver().default.gt(c.component.id.version, comp.component.id.version));
-      return !sameIdHigherVersion;
+    await scopeComponentsImporter.importManyDeltaWithoutDeps(ids, allHistory, lane, ignoreMissingHead);
+
+    _loader().default.start(`import ${ids.length} components with their dependencies (if missing)`);
+
+    const results = fromOriginalScope ? await scopeComponentsImporter.importManyFromOriginalScopes(ids) : await scopeComponentsImporter.importMany({
+      ids,
+      ignoreMissingHead,
+      lanes: lane ? [lane] : undefined
     });
+    return results;
   }
   /**
    * consider the following use cases:
@@ -477,9 +491,14 @@ bit import ${idsFromRemote.map(id => id.toStringWithoutVersion()).join(' ')}`);
       }
 
       if (this.options.importDependents) {
-        const dependentsIds = this._getDependentsFromGraph(bitIds, graphs);
+        const graph = await this.graph.getGraph();
+        const targetCompIds = await this.workspace.resolveMultipleComponentIds(bitIds);
+        const sourceIds = await this.workspace.listIds();
+        const ids = graph.findIdsFromSourcesToTargets(sourceIds, targetCompIds);
 
-        bitIds.push(...dependentsIds);
+        _logger().default.debug(`found ${ids.length} component for --dependents flag`, ids.map(id => id.toString()));
+
+        bitIds.push(...ids.map(id => id._legacy));
       }
     }
 
@@ -529,25 +548,36 @@ bit import ${idsFromRemote.map(id => id.toStringWithoutVersion()).join(' ')}`);
 
     await this._throwForModifiedOrNewComponents(componentsIdsToImport);
     const beforeImportVersions = await this._getCurrentVersions(componentsIdsToImport);
-    let componentsAndDependencies = [];
 
-    if (componentsIdsToImport.length) {
-      // change all ids version to 'latest'. otherwise, it tries to import local tags/snaps from a remote
-      // const idsWithLatestVersion = componentsIdsToImport.toVersionLatest();
-      if (!this.options.objectsOnly) {
-        throw new Error(`bit import with no ids and --merge flag was not implemented yet`);
-      }
+    if (!componentsIdsToImport.length) {
+      return {
+        importedIds: [],
+        importedDeps: [],
+        importDetails: []
+      };
+    }
 
-      componentsAndDependencies = await this.consumer.importComponentsObjects(componentsIdsToImport, {
-        fromOriginalScope: this.options.fromOriginalScope,
-        allHistory: this.options.allHistory
-      });
-      await this._writeToFileSystem(componentsAndDependencies);
+    if (!this.options.objectsOnly) {
+      throw new Error(`bit import with no ids and --merge flag was not implemented yet`);
+    }
+
+    const versionDependenciesArr = await this._importComponentsObjects(componentsIdsToImport, {
+      fromOriginalScope: this.options.fromOriginalScope,
+      allHistory: this.options.allHistory
+    });
+    let writtenComponents = [];
+
+    if (!this.options.objectsOnly) {
+      const componentWithDependencies = await (0, _versionDependencies().multipleVersionDependenciesToConsumer)(versionDependenciesArr, this.scope.objects);
+      await this._writeToFileSystem(componentWithDependencies);
+      writtenComponents = componentWithDependencies.map(c => c.component);
     }
 
-    const importDetails = await this._getImportDetails(beforeImportVersions, componentsAndDependencies);
+    const importDetails = await this._getImportDetails(beforeImportVersions, versionDependenciesArr);
     return {
-      dependencies: componentsAndDependencies,
+      importedIds: versionDependenciesArr.map(v => v.component.id).flat(),
+      importedDeps: versionDependenciesArr.map(v => v.allDependenciesIds).flat(),
+      writtenComponents,
       importDetails
     };
   }
@@ -596,7 +626,7 @@ bit import ${idsFromRemote.map(id => id.toStringWithoutVersion()).join(' ')}`);
 
       const filesStatus = this.mergeStatus && this.mergeStatus[idStr] ? this.mergeStatus[idStr] : null;
       const deprecated = await modelComponent.isDeprecated(this.scope.objects);
-      const removed = component.component.removed;
+      const removed = await component.component.component.isRemoved(this.scope.objects);
       const latestVersion = modelComponent.latest();
       return {
         id: idStr,
@@ -604,7 +634,7 @@ bit import ${idsFromRemote.map(id => id.toStringWithoutVersion()).join(' ')}`);
         latestVersion: versionDifference.includes(latestVersion) ? latestVersion : null,
         status: getStatus(),
         filesStatus,
-        missingDeps: component.missingDependencies,
+        missingDeps: component.getMissingDependencies(),
         deprecated,
         removed
       };