fix(sign), write the correct version according to the current snap in the package.json (#9039)

Author: davidfirst

e2e/harmony/sign.e2e.ts

@@ -188,21 +188,31 @@ describe('sign command', function () {
       helper.scopeHelper.addRemoteScope(helper.scopes.remotePath, signRemote.scopePath);
       signOutput = helper.command.sign(
         [`${secondScopeName}/comp1@${snapHash}`],
-        `--lane ${helper.scopes.remote}/dev`,
+        `--lane ${helper.scopes.remote}/dev --save-locally`,
         signRemote.scopePath
       );
       expect(signOutput).to.include('the following 1 component(s) were signed with build-status "succeed"');
       expect(signOutput).to.not.include('tag pipe');
       expect(signOutput).to.include('snap pipe');
+
+      const obj = helper.command.catObject(snapHash, true, signRemote.scopePath);
+      const pkgAspectData = helper.command.getAspectsData(obj, Extensions.pkg);
+      const version = pkgAspectData.data.pkgJson.version;
+      expect(version).to.equal(`0.0.0-${snapHash}`);
     });
     it('should be able to sign previous snaps on this lane successfully', () => {
       helper.scopeHelper.addRemoteScope(helper.scopes.remotePath, signRemote.scopePath);
       signOutput = helper.command.sign(
         [`${secondScopeName}/comp1@${firstSnapHash}`],
-        `--lane ${helper.scopes.remote}/dev`,
+        `--lane ${helper.scopes.remote}/dev --save-locally`,
         signRemote.scopePath
       );
       expect(signOutput).to.include('the following 1 component(s) were signed with build-status "succeed"');
+
+      const obj = helper.command.catObject(firstSnapHash, true, signRemote.scopePath);
+      const pkgAspectData = helper.command.getAspectsData(obj, Extensions.pkg);
+      const version = pkgAspectData.data.pkgJson.version;
+      expect(version).to.equal(`0.0.0-${firstSnapHash}`);
     });
     // todo: support exporting to a non-hub
     it.skip('should sign the last successfully and export', () => {

scopes/component/component-package-version/component-package-version.ts

@@ -4,26 +4,13 @@ import { isHash } from '@teambit/component-version';
 export const SNAP_VERSION_PREFIX = '0.0.0-';
 
 /**
- * This function will calculate the package version for a component.
- * It is used mainly for supporting lanes and snaps during capsule creation
- * The general format is like this:
- * {0.0.0}-{snapHash}
- * but there are some exceptions:
- * in case the snapHash equal to the closestTagSemver snap hash the format will be just
- * {closestTagSemver}
- * @param component
+ * get a valid semver package version of a component.
  */
-export function getComponentPackageVersion(component: Component, snapId?: string): string {
-  const actualSnapId = snapId || component.head?.hash;
-  if (!actualSnapId) {
-    return '0.0.0';
-  }
-  // Checking if the snap is already a tag
-  const tagBySnap = component.tags.byHash(actualSnapId);
-  if (tagBySnap) {
-    return `${tagBySnap.version}`;
-  }
-  return snapToSemver(actualSnapId);
+export function getComponentPackageVersion(component: Component): string {
+  const version = component.id.version;
+  if (!version)
+    throw new Error(`getComponentPackageVersion: component ${component.id.toString()} is missing a version`);
+  return snapToSemver(version);
 }
 
 export function snapToSemver(version: string): string {

scopes/component/isolator/isolator.main.runtime.ts

@@ -1097,7 +1097,7 @@ export class IsolatorMain {
         const depCapsule = capsules.getCapsule(dep.componentId);
         let version = dep.version;
         if (depCapsule) {
-          version = getComponentPackageVersion(depCapsule?.component);
+          version = getComponentPackageVersion(depCapsule.component);
         } else {
           version = snapToSemver(version);
         }

src/e2e-helper/e2e-command-helper.ts

@@ -482,6 +482,11 @@ export default class CommandHelper {
     if (!artifacts) throw new Error(`unable to find artifacts data for ${id}`);
     return artifacts;
   }
+  getAspectsData(versionObject: Record<string, any>, aspectId: string) {
+    const builder = versionObject.extensions.find((e) => e.name === Extensions.builder);
+    if (!builder) throw new Error(`getAspectsData: unable to find builder data`);
+    return builder.data.aspectsData.find((a) => a.aspectId === aspectId);
+  }
   reset(id: string, head = false, flag = '') {
     return this.runCmd(`bit reset ${id} ${head ? '--head' : ''} ${flag}`);
   }