@teambit/snapping 1.0.444 → 1.0.445

package/dist/snapping.main.runtime.js

@@ -624,9 +624,9 @@ if you're willing to lose the history from the head to the specified version, us
       targetId: f.componentId.fullName,
       targetScope: f.componentId.scope
     }));
-    const forkResults = forkMultipleData.length ? await this.forking.forkMultipleFromRemote(forkMultipleData, {
+    const forkResults = await this.forking.forkMultipleFromRemote(forkMultipleData, {
       refactor: true
-    }) : [];
+    });
     const newEnvData = {};
     forkedFromData.forEach(f => {
       const bitmapElem = this.workspace.bitMap.getBitmapEntry(f.componentId);
@@ -642,7 +642,6 @@ if you're willing to lose the history from the head to the specified version, us
     await (0, _pMapSeries().default)(Object.entries(newEnvData), async ([env, compIds]) => {
       await this.workspace.setEnvToComponents(_componentId().ComponentID.fromString(env), compIds, false);
     });
-    // @todo: merge current config in .bitmap with "aspect" prop of forkedFromData.
     const getSnapData = id => {
       const snapData = snapDataPerComp.find(t => {
         return t.componentId.isEqual(id, {
@@ -652,15 +651,35 @@ if you're willing to lose the history from the head to the specified version, us
       if (!snapData) throw new Error(`unable to find ${id.toString()} in snapDataPerComp`);
       return snapData;
     };
-    const newForkedComponents = forkResults.length ? await this.workspace.getMany(forkResults.map(f => f.targetCompId)) : [];
+    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.aspects) await this.scope.addAspectsFromConfigObject(comp, snapData.aspects);
       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, {