@teambit/importer 0.0.50 → 0.0.58

package/__preview-1642994756471.js

@@ -0,0 +1 @@
+

package/dist/importer.aspect.js

@@ -16,7 +16,7 @@ function _harmony() {
 }
 
 const ImporterAspect = _harmony().Aspect.create({
-  id: 'teambit.bit/importer'
+  id: 'teambit.scope/importer'
 });
 
 exports.ImporterAspect = ImporterAspect;

package/dist/importer.aspect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["importer.aspect.ts"],"names":["ImporterAspect","Aspect","create","id"],"mappings":";;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,MAAMA,cAAc,GAAGC,kBAAOC,MAAP,CAAc;AAC1CC,EAAAA,EAAE,EAAE;AADsC,CAAd,CAAvB","sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const ImporterAspect = Aspect.create({\n  id: 'teambit.bit/importer',\n});\n"]}
+{"version":3,"sources":["importer.aspect.ts"],"names":["ImporterAspect","Aspect","create","id"],"mappings":";;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,MAAMA,cAAc,GAAGC,kBAAOC,MAAP,CAAc;AAC1CC,EAAAA,EAAE,EAAE;AADsC,CAAd,CAAvB","sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const ImporterAspect = Aspect.create({\n  id: 'teambit.scope/importer',\n});\n"]}

package/dist/importer.js

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

package/dist/importer.js.map

@@ -1 +1 @@
-{"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","objectsOnly"],"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;AACA1B,IAAAA,aAAa,CAAC8B,WAAd,GAA4B,IAA5B;AACD;;AAvCmB","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    importOptions.objectsOnly = true;\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","currentRemoteLane","getCurrentRemoteLaneId","lanes","laneIds","laneId","lane"],"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,UAAM,KAAKE,yBAAL,CAA+BH,aAA/B,CAAN;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;;AAEsC,QAAzBf,yBAAyB,CAACH,aAAD,EAA+B;AACpE,UAAM0B,iBAAiB,GAAG,MAAM,KAAK7B,SAAL,CAAe8B,sBAAf,EAAhC;;AACA,QAAID,iBAAJ,EAAuB;AACrB1B,MAAAA,aAAa,CAAC4B,KAAd,GAAsB;AAAEC,QAAAA,OAAO,EAAE,CAACH,iBAAiB,CAACI,MAAnB,CAAX;AAAuCF,QAAAA,KAAK,EAAE,CAACF,iBAAiB,CAACK,IAAnB;AAA9C,OAAtB;AACD;AACF;;AAlCmB","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    await 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 async populateLanesDataIfNeeded(importOptions: ImportOptions) {\n    const currentRemoteLane = await this.workspace.getCurrentRemoteLaneId();\n    if (currentRemoteLane) {\n      importOptions.lanes = { laneIds: [currentRemoteLane.laneId], lanes: [currentRemoteLane.lane] };\n    }\n  }\n}\n"]}

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@teambit/importer",
-  "version": "0.0.50",
+  "version": "0.0.58",
   "homepage": "https://bit.dev/teambit/scope/importer",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "importer",
-    "version": "0.0.50"
+    "version": "0.0.58"
   },
   "dependencies": {
     "chalk": "2.4.2",
     "ramda": "0.27.1",
     "@teambit/harmony": "0.2.11",
     "@babel/runtime": "7.12.18",
-    "core-js": "^3.0.0"
+    "core-js": "^3.0.0",
+    "@teambit/cli": "0.0.433",
+    "@teambit/dependency-resolver": "0.0.629",
+    "@teambit/workspace": "0.0.629"
   },
   "devDependencies": {
     "@types/mocha": "5.2.7",
@@ -24,7 +27,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.205",
+    "@teambit/legacy": "1.0.209",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -52,7 +55,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.205",
+        "@teambit/legacy": "1.0.209",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }