@teambit/importer 0.0.3 → 0.0.5

package/dist/importer.d.ts

@@ -8,4 +8,5 @@ export declare class Importer {
     import(importOptions: ImportOptions, packageManagerArgs: string[]): Promise<ImportResult>;
     private removeFromWorkspaceConfig;
     private getImportedPackagesNames;
+    private populateLanesDataIfNeeded;
 }

package/dist/importer.js

@@ -58,6 +58,7 @@ class Importer {
   async import(importOptions, packageManagerArgs) {
     const consumer = this.workspace.consumer;
     consumer.packageManagerArgs = packageManagerArgs;
+    this.populateLanesDataIfNeeded(importOptions);
     const importComponents = new (_importComponents().default)(consumer, importOptions);
     const {
       dependencies,
@@ -89,6 +90,22 @@ class Importer {
     return components.map(component => (0, _componentIdToPackageName().default)(component));
   }
 
+  populateLanesDataIfNeeded(importOptions) {
+    if (importOptions.ids.length) {
+      return;
+    }
+
+    const remoteLaneId = this.workspace.getCurrentRemoteLaneId();
+
+    if (!remoteLaneId) {
+      return;
+    }
+
+    importOptions.lanes = {
+      laneIds: [remoteLaneId]
+    };
+  }
+
 }
 
 exports.Importer = Importer;

package/dist/importer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["importer.ts"],"names":["Importer","constructor","workspace","depResolver","import","importOptions","packageManagerArgs","consumer","importComponents","ImportComponents","dependencies","importDetails","bitIds","map","R","path","Analytics","setExtraData","length","ids","importedComponents","d","component","removeFromWorkspaceConfig","onDestroy","importedPackageNames","getImportedPackagesNames","removeFromRootPolicy","persistConfig","components"],"mappings":";;;;;;;;;;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAKA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,MAAMA,QAAN,CAAe;AACpBC,EAAAA,WAAW,CAASC,SAAT,EAAuCC,WAAvC,EAA4E;AAAA,SAAnED,SAAmE,GAAnEA,SAAmE;AAAA,SAArCC,WAAqC,GAArCA,WAAqC;AAAE;;AAE7E,QAANC,MAAM,CAACC,aAAD,EAA+BC,kBAA/B,EAAoF;AAC9F,UAAMC,QAAQ,GAAG,KAAKL,SAAL,CAAeK,QAAhC;AACAA,IAAAA,QAAQ,CAACD,kBAAT,GAA8BA,kBAA9B;AACA,UAAME,gBAAgB,GAAG,KAAIC,2BAAJ,EAAqBF,QAArB,EAA+BF,aAA/B,CAAzB;AACA,UAAM;AAAEK,MAAAA,YAAF;AAAgBC,MAAAA;AAAhB,QAAkC,MAAMH,gBAAgB,CAACA,gBAAjB,EAA9C;AACA,UAAMI,MAAM,GAAGF,YAAY,CAACG,GAAb,CAAiBC,iBAAEC,IAAF,CAAO,CAAC,WAAD,EAAc,IAAd,CAAP,CAAjB,CAAf;;AACAC,2BAAUC,YAAV,CAAuB,gBAAvB,EAAyCL,MAAM,CAACM,MAAhD;;AACA,QAAIb,aAAa,CAACc,GAAd,CAAkBD,MAAtB,EAA8B;AAC5B,YAAME,kBAAkB,GAAGV,YAAY,CAACG,GAAb,CAAkBQ,CAAD,IAAOA,CAAC,CAACC,SAA1B,CAA3B;AACA,YAAM,KAAKC,yBAAL,CAA+BH,kBAA/B,CAAN;AACD;;AACD,UAAMb,QAAQ,CAACiB,SAAT,EAAN;AACA,WAAO;AAAEd,MAAAA,YAAF;AAAgBC,MAAAA;AAAhB,KAAP;AACD;;AAEsC,QAAzBY,yBAAyB,CAACD,SAAD,EAAiC;AACtE,UAAMG,oBAAoB,GAAG,KAAKC,wBAAL,CAA8BJ,SAA9B,CAA7B;AACA,SAAKnB,WAAL,CAAiBwB,oBAAjB,CAAsCF,oBAAtC;AACA,UAAM,KAAKtB,WAAL,CAAiByB,aAAjB,CAA+B,KAAK1B,SAAL,CAAea,IAA9C,CAAN;AACD;;AAEOW,EAAAA,wBAAwB,CAACG,UAAD,EAA4C;AAC1E,WAAOA,UAAU,CAAChB,GAAX,CAAgBS,SAAD,IAAe,yCAAyBA,SAAzB,CAA9B,CAAP;AACD;;AA1BmB","sourcesContent":["import { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Analytics } from '@teambit/legacy/dist/analytics/analytics';\nimport ImportComponents, {\n  ImportOptions,\n  ImportResult,\n} from '@teambit/legacy/dist/consumer/component-ops/import-components';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\n\nexport class Importer {\n  constructor(private workspace: Workspace, private depResolver: DependencyResolverMain) {}\n\n  async import(importOptions: ImportOptions, packageManagerArgs: string[]): Promise<ImportResult> {\n    const consumer = this.workspace.consumer;\n    consumer.packageManagerArgs = packageManagerArgs;\n    const importComponents = new ImportComponents(consumer, importOptions);\n    const { dependencies, importDetails } = await importComponents.importComponents();\n    const bitIds = dependencies.map(R.path(['component', 'id']));\n    Analytics.setExtraData('num_components', bitIds.length);\n    if (importOptions.ids.length) {\n      const importedComponents = dependencies.map((d) => d.component);\n      await this.removeFromWorkspaceConfig(importedComponents);\n    }\n    await consumer.onDestroy();\n    return { dependencies, importDetails };\n  }\n\n  private async removeFromWorkspaceConfig(component: ConsumerComponent[]) {\n    const importedPackageNames = this.getImportedPackagesNames(component);\n    this.depResolver.removeFromRootPolicy(importedPackageNames);\n    await this.depResolver.persistConfig(this.workspace.path);\n  }\n\n  private getImportedPackagesNames(components: ConsumerComponent[]): string[] {\n    return components.map((component) => componentIdToPackageName(component));\n  }\n}\n"]}
+{"version":3,"sources":["importer.ts"],"names":["Importer","constructor","workspace","depResolver","import","importOptions","packageManagerArgs","consumer","populateLanesDataIfNeeded","importComponents","ImportComponents","dependencies","importDetails","bitIds","map","R","path","Analytics","setExtraData","length","ids","importedComponents","d","component","removeFromWorkspaceConfig","onDestroy","importedPackageNames","getImportedPackagesNames","removeFromRootPolicy","persistConfig","components","remoteLaneId","getCurrentRemoteLaneId","lanes","laneIds"],"mappings":";;;;;;;;;;;AAEA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAKA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,MAAMA,QAAN,CAAe;AACpBC,EAAAA,WAAW,CAASC,SAAT,EAAuCC,WAAvC,EAA4E;AAAA,SAAnED,SAAmE,GAAnEA,SAAmE;AAAA,SAArCC,WAAqC,GAArCA,WAAqC;AAAE;;AAE7E,QAANC,MAAM,CAACC,aAAD,EAA+BC,kBAA/B,EAAoF;AAC9F,UAAMC,QAAQ,GAAG,KAAKL,SAAL,CAAeK,QAAhC;AACAA,IAAAA,QAAQ,CAACD,kBAAT,GAA8BA,kBAA9B;AACA,SAAKE,yBAAL,CAA+BH,aAA/B;AACA,UAAMI,gBAAgB,GAAG,KAAIC,2BAAJ,EAAqBH,QAArB,EAA+BF,aAA/B,CAAzB;AACA,UAAM;AAAEM,MAAAA,YAAF;AAAgBC,MAAAA;AAAhB,QAAkC,MAAMH,gBAAgB,CAACA,gBAAjB,EAA9C;AACA,UAAMI,MAAM,GAAGF,YAAY,CAACG,GAAb,CAAiBC,iBAAEC,IAAF,CAAO,CAAC,WAAD,EAAc,IAAd,CAAP,CAAjB,CAAf;;AACAC,2BAAUC,YAAV,CAAuB,gBAAvB,EAAyCL,MAAM,CAACM,MAAhD;;AACA,QAAId,aAAa,CAACe,GAAd,CAAkBD,MAAtB,EAA8B;AAC5B,YAAME,kBAAkB,GAAGV,YAAY,CAACG,GAAb,CAAkBQ,CAAD,IAAOA,CAAC,CAACC,SAA1B,CAA3B;AACA,YAAM,KAAKC,yBAAL,CAA+BH,kBAA/B,CAAN;AACD;;AACD,UAAMd,QAAQ,CAACkB,SAAT,EAAN;AACA,WAAO;AAAEd,MAAAA,YAAF;AAAgBC,MAAAA;AAAhB,KAAP;AACD;;AAEsC,QAAzBY,yBAAyB,CAACD,SAAD,EAAiC;AACtE,UAAMG,oBAAoB,GAAG,KAAKC,wBAAL,CAA8BJ,SAA9B,CAA7B;AACA,SAAKpB,WAAL,CAAiByB,oBAAjB,CAAsCF,oBAAtC;AACA,UAAM,KAAKvB,WAAL,CAAiB0B,aAAjB,CAA+B,KAAK3B,SAAL,CAAec,IAA9C,CAAN;AACD;;AAEOW,EAAAA,wBAAwB,CAACG,UAAD,EAA4C;AAC1E,WAAOA,UAAU,CAAChB,GAAX,CAAgBS,SAAD,IAAe,yCAAyBA,SAAzB,CAA9B,CAAP;AACD;;AAEOf,EAAAA,yBAAyB,CAACH,aAAD,EAA+B;AAC9D,QAAIA,aAAa,CAACe,GAAd,CAAkBD,MAAtB,EAA8B;AAC5B;AACD;;AACD,UAAMY,YAAY,GAAG,KAAK7B,SAAL,CAAe8B,sBAAf,EAArB;;AACA,QAAI,CAACD,YAAL,EAAmB;AACjB;AACD;;AACD1B,IAAAA,aAAa,CAAC4B,KAAd,GAAsB;AAAEC,MAAAA,OAAO,EAAE,CAACH,YAAD;AAAX,KAAtB;AACD;;AAtCmB","sourcesContent":["import { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Analytics } from '@teambit/legacy/dist/analytics/analytics';\nimport ImportComponents, {\n  ImportOptions,\n  ImportResult,\n} from '@teambit/legacy/dist/consumer/component-ops/import-components';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';\n\nexport class Importer {\n  constructor(private workspace: Workspace, private depResolver: DependencyResolverMain) {}\n\n  async import(importOptions: ImportOptions, packageManagerArgs: string[]): Promise<ImportResult> {\n    const consumer = this.workspace.consumer;\n    consumer.packageManagerArgs = packageManagerArgs;\n    this.populateLanesDataIfNeeded(importOptions);\n    const importComponents = new ImportComponents(consumer, importOptions);\n    const { dependencies, importDetails } = await importComponents.importComponents();\n    const bitIds = dependencies.map(R.path(['component', 'id']));\n    Analytics.setExtraData('num_components', bitIds.length);\n    if (importOptions.ids.length) {\n      const importedComponents = dependencies.map((d) => d.component);\n      await this.removeFromWorkspaceConfig(importedComponents);\n    }\n    await consumer.onDestroy();\n    return { dependencies, importDetails };\n  }\n\n  private async removeFromWorkspaceConfig(component: ConsumerComponent[]) {\n    const importedPackageNames = this.getImportedPackagesNames(component);\n    this.depResolver.removeFromRootPolicy(importedPackageNames);\n    await this.depResolver.persistConfig(this.workspace.path);\n  }\n\n  private getImportedPackagesNames(components: ConsumerComponent[]): string[] {\n    return components.map((component) => componentIdToPackageName(component));\n  }\n\n  private populateLanesDataIfNeeded(importOptions: ImportOptions) {\n    if (importOptions.ids.length) {\n      return;\n    }\n    const remoteLaneId = this.workspace.getCurrentRemoteLaneId();\n    if (!remoteLaneId) {\n      return;\n    }\n    importOptions.lanes = { laneIds: [remoteLaneId] };\n  }\n}\n"]}

package/importer.ts

@@ -15,6 +15,7 @@ export class Importer {
   async import(importOptions: ImportOptions, packageManagerArgs: string[]): Promise<ImportResult> {
     const consumer = this.workspace.consumer;
     consumer.packageManagerArgs = packageManagerArgs;
+    this.populateLanesDataIfNeeded(importOptions);
     const importComponents = new ImportComponents(consumer, importOptions);
     const { dependencies, importDetails } = await importComponents.importComponents();
     const bitIds = dependencies.map(R.path(['component', 'id']));
@@ -36,4 +37,15 @@ export class Importer {
   private getImportedPackagesNames(components: ConsumerComponent[]): string[] {
     return components.map((component) => componentIdToPackageName(component));
   }
+
+  private populateLanesDataIfNeeded(importOptions: ImportOptions) {
+    if (importOptions.ids.length) {
+      return;
+    }
+    const remoteLaneId = this.workspace.getCurrentRemoteLaneId();
+    if (!remoteLaneId) {
+      return;
+    }
+    importOptions.lanes = { laneIds: [remoteLaneId] };
+  }
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/importer",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "homepage": "https://bit.dev/teambit/scope/importer",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "importer",
-    "version": "0.0.3"
+    "version": "0.0.5"
   },
   "dependencies": {
     "chalk": "2.4.2",