@teambit/isolator 1.0.411 → 1.0.412

package/dist/isolator.main.runtime.d.ts

@@ -1,17 +1,14 @@
 import { CLIMain } from '@teambit/cli';
 import { AspectLoaderMain } from '@teambit/aspect-loader';
-import { Component } from '@teambit/component';
 import type { ComponentMain, ComponentFactory } from '@teambit/component';
 import { GraphMain } from '@teambit/graph';
 import { SlotRegistry } from '@teambit/harmony';
 import { DependencyResolverMain, LinkingOptions, NodeLinker } from '@teambit/dependency-resolver';
 import { Logger, LoggerMain } from '@teambit/logger';
-import { ComponentID, ComponentIdList } from '@teambit/component-id';
+import { ComponentID } from '@teambit/component-id';
 import LegacyScope from '@teambit/legacy/dist/scope/scope';
 import { GlobalConfigMain } from '@teambit/global-config';
-import { DataToPersist } from '@teambit/component.sources';
 import { PathOsBasedAbsolute } from '@teambit/legacy.utils';
-import { Scope } from '@teambit/legacy/dist/scope';
 import { Capsule } from './capsule';
 import { Network } from './network';
 export type ListResults = {
@@ -127,6 +124,12 @@ export type IsolateComponentsOptions = CreateGraphOptions & {
      * the idea is to have all build artifacts from the previous snap and run deploy pipeline on top of it.
      */
     populateArtifactsFrom?: ComponentID[];
+    /**
+     * relevant when populateArtifactsFrom is set.
+     * by default, it uses the package.json created in the previous snap as a base and make the necessary changes.
+     * if this is set to true, it will ignore the package.json from the previous snap.
+     */
+    populateArtifactsIgnorePkgJson?: boolean;
     /**
      * Force specific host to get the component from.
      */
@@ -252,7 +255,9 @@ export declare class IsolatorMain {
     private getCapsulesPreviousPackageJson;
     private updateWithCurrentPackageJsonData;
     private getCurrentPackageJson;
-    populateComponentsFilesToWriteForCapsule(component: Component, ids: ComponentIdList, legacyScope?: Scope, opts?: IsolateComponentsOptions): Promise<DataToPersist>;
+    private populateComponentsFilesToWriteForCapsule;
+    private mergePkgJsonFromLastBuild;
+    private getCompForArtifacts;
     private preparePackageJsonToWrite;
     /**
      * currently, it writes all artifacts.

package/dist/isolator.main.runtime.js

@@ -780,11 +780,18 @@ class IsolatorMain {
     const legacyComponents = [...legacyUnmodifiedComps, ...legacyModifiedComps];
     if (legacyScope && unmodifiedComps.length) await (0, _component2().importMultipleDistsArtifacts)(legacyScope, legacyUnmodifiedComps);
     const allIds = _componentId().ComponentIdList.fromArray(legacyComponents.map(c => c.id));
+    const getParentsComp = () => {
+      const artifactsFrom = opts?.populateArtifactsFrom;
+      if (!artifactsFrom) return undefined;
+      if (!legacyScope) throw new Error('populateArtifactsFrom is set but legacyScope is not defined');
+      return Promise.all(artifactsFrom.map(id => legacyScope.getConsumerComponent(id)));
+    };
+    const populateArtifactsFromComps = await getParentsComp();
     await Promise.all(components.map(async component => {
       const capsule = capsuleList.getCapsule(component.id);
       if (!capsule) return;
       const scope = (await _capsuleList().default.capsuleUsePreviouslySavedDists(component)) || opts?.populateArtifactsFrom ? legacyScope : undefined;
-      const dataToPersist = await this.populateComponentsFilesToWriteForCapsule(component, allIds, scope, opts);
+      const dataToPersist = await this.populateComponentsFilesToWriteForCapsule(component, allIds, scope, opts, populateArtifactsFromComps);
       await dataToPersist.persistAllToCapsule(capsule, {
         keepExistingCapsule: true
       });
@@ -968,7 +975,7 @@ class IsolatorMain {
     packageJson.addOrUpdateProperty('version', currentVersion);
     return packageJson;
   }
-  async populateComponentsFilesToWriteForCapsule(component, ids, legacyScope, opts) {
+  async populateComponentsFilesToWriteForCapsule(component, ids, legacyScope, opts, populateArtifactsFromComps) {
     const legacyComp = component.state._consumer;
     const dataToPersist = new (_component2().DataToPersist)();
     const clonedFiles = legacyComp.files.map(file => file.clone());
@@ -987,11 +994,49 @@ class IsolatorMain {
     await _workspaceModules().PackageJsonTransformer.applyTransformers(component, packageJson);
     const valuesToMerge = legacyComp.overrides.componentOverridesPackageJsonData;
     packageJson.mergePackageJsonObject(valuesToMerge);
+    if (populateArtifactsFromComps && !opts?.populateArtifactsIgnorePkgJson) {
+      const compParent = this.getCompForArtifacts(component, populateArtifactsFromComps);
+      this.mergePkgJsonFromLastBuild(compParent, packageJson);
+    }
     dataToPersist.addFile(packageJson.toVinylFile());
-    const artifacts = await this.getArtifacts(component, legacyScope, opts?.populateArtifactsFrom);
+    const artifacts = await this.getArtifacts(component, legacyScope, populateArtifactsFromComps);
     dataToPersist.addManyFiles(artifacts);
     return dataToPersist;
   }
+  mergePkgJsonFromLastBuild(component, packageJson) {
+    const suffix = `for ${component.id.toString()}. to workaround this, use --ignore-last-pkg-json flag`;
+    const aspectsData = component.extensions.findExtension('teambit.pipelines/builder')?.data?.aspectsData;
+    if (!aspectsData) throw new Error(`getPkgJsonFromLastBuild, unable to find builder aspects data ${suffix}`);
+    const data = aspectsData?.find(aspectData => aspectData.aspectId === 'teambit.pkg/pkg');
+    if (!data) throw new Error(`getPkgJsonFromLastBuild, unable to find pkg aspect data ${suffix}`);
+    const pkgJsonLastBuild = data?.data?.pkgJson;
+    if (!pkgJsonLastBuild) throw new Error(`getPkgJsonFromLastBuild, unable to find pkgJson of pkg aspect  ${suffix}`);
+    const current = packageJson.packageJsonObject;
+    pkgJsonLastBuild.componentId = current.componentId;
+    pkgJsonLastBuild.version = current.version;
+    const mergeDeps = (currentDeps, depsFromLastBuild) => {
+      if (!depsFromLastBuild) return;
+      if (!currentDeps) return depsFromLastBuild;
+      Object.keys(depsFromLastBuild).forEach(depName => {
+        if (!currentDeps[depName]) return;
+        depsFromLastBuild[depName] = currentDeps[depName];
+      });
+      return depsFromLastBuild;
+    };
+    pkgJsonLastBuild.dependencies = mergeDeps(current.dependencies, pkgJsonLastBuild.dependencies);
+    pkgJsonLastBuild.devDependencies = mergeDeps(current.devDependencies, pkgJsonLastBuild.devDependencies);
+    pkgJsonLastBuild.peerDependencies = mergeDeps(current.peerDependencies, pkgJsonLastBuild.peerDependencies);
+    packageJson.mergePackageJsonObject(pkgJsonLastBuild);
+  }
+  getCompForArtifacts(component, populateArtifactsFromComps) {
+    const compParent = populateArtifactsFromComps.find(comp => comp.id.isEqual(component.id, {
+      ignoreVersion: true
+    }));
+    if (!compParent) {
+      throw new Error(`isolator, unable to find where to populate the artifacts from for ${component.id.toString()}`);
+    }
+    return compParent;
+  }
   preparePackageJsonToWrite(component, bitDir, ignoreBitDependencies = true) {
     const legacyComp = component.state._consumer;
     this.logger.debug(`package-json.preparePackageJsonToWrite. bitDir ${bitDir}.`);
@@ -1029,27 +1074,20 @@ class IsolatorMain {
    * later, this responsibility might move to pkg extension, which could write only artifacts
    * that are set in package.json.files[], to have a similar structure of a package.
    */
-  async getArtifacts(component, legacyScope, populateArtifactsFrom) {
+  async getArtifacts(component, legacyScope, populateArtifactsFromComps) {
     const legacyComp = component.state._consumer;
     if (!legacyScope) {
-      if (populateArtifactsFrom) throw new Error(`unable to fetch from parent, the legacyScope was not provided`);
       // when capsules are written via the workspace, do not write artifacts, they get created by
       // build-pipeline. when capsules are written via the scope, we do need the dists.
       return [];
     }
-    if (legacyComp.buildStatus !== 'succeed' && !populateArtifactsFrom) {
+    if (legacyComp.buildStatus !== 'succeed' && !populateArtifactsFromComps) {
       // this is important for "bit sign" when on lane to not go to the original scope
       return [];
     }
     const artifactFilesToFetch = async () => {
-      if (populateArtifactsFrom) {
-        const found = populateArtifactsFrom.find(id => id.isEqual(component.id, {
-          ignoreVersion: true
-        }));
-        if (!found) {
-          throw new Error(`getArtifacts: unable to find where to populate the artifacts from for ${component.id.toString()}`);
-        }
-        const compParent = await legacyScope.getConsumerComponent(found);
+      if (populateArtifactsFromComps) {
+        const compParent = this.getCompForArtifacts(component, populateArtifactsFromComps);
         return (0, _component2().getArtifactFilesExcludeExtension)(compParent.extensions, 'teambit.pkg/pkg');
       }
       const extensionsNamesForArtifacts = ['teambit.compilation/compiler'];