@teambit/objects 0.0.731 → 0.0.733

package/models/version-history.spec.ts

@@ -0,0 +1,60 @@
+import { expect } from 'chai';
+import Ref from '../objects/ref';
+import VersionHistory from './version-history';
+import type { VersionParents } from './version-history';
+
+const hash = (i: number) => i.toString(16).padStart(40, '0');
+const ref = (i: number) => new Ref(hash(i));
+const item = (i: number, parents: number[] = i > 0 ? [i - 1] : []): VersionParents => ({
+  hash: ref(i),
+  parents: parents.map(ref),
+});
+const linear = (from: number, to: number) => Array.from({ length: to - from }, (_, j) => item(from + j));
+const create = (versions: VersionParents[]) => VersionHistory.create('button', 'acme.ui', versions);
+const hashes = (versionHistory: VersionHistory) => versionHistory.versions.map((v) => v.hash.toString());
+
+describe('VersionHistory', () => {
+  describe('merge', () => {
+    it('keeps the incoming versions, then the versions only the existing history has', () => {
+      const existing = create([...linear(0, 3), item(10, [2]), item(11, [10])]);
+      const incoming = create(linear(0, 5));
+      existing.merge(incoming);
+      expect(hashes(existing)).to.deep.equal([hash(0), hash(1), hash(2), hash(3), hash(4), hash(10), hash(11)]);
+    });
+
+    it('takes the incoming data of a version both histories have', () => {
+      const existing = create([item(0), item(1, [0]), item(2, [1])]);
+      const incoming = create([item(0), item(1, [0]), item(2, [0])]);
+      existing.merge(incoming);
+      expect(existing.getVersionData(ref(2))?.parents.map(String)).to.deep.equal([hash(0)]);
+    });
+
+    it('keeps the existing history when the incoming one is empty', () => {
+      const existing = create(linear(0, 3));
+      existing.merge(create([]));
+      expect(hashes(existing)).to.deep.equal(hashes(create(linear(0, 3))));
+    });
+
+    it('takes the incoming history when the existing one is empty', () => {
+      const existing = create([]);
+      existing.merge(create(linear(0, 3)));
+      expect(hashes(existing)).to.deep.equal(hashes(create(linear(0, 3))));
+    });
+
+    it('stays the same when the incoming history is already part of the existing one', () => {
+      const existing = create([...linear(0, 4), item(20, [3])]);
+      existing.merge(create(linear(0, 4)));
+      expect(hashes(existing).sort()).to.deep.equal([hash(0), hash(1), hash(2), hash(3), hash(20)].sort());
+    });
+
+    it('stays fast when the existing history has thousands of versions the incoming one does not', () => {
+      const size = 20000;
+      const existing = create([...linear(0, size), ...Array.from({ length: size }, (_, j) => item(size + j, [j]))]);
+      const incoming = create(linear(0, size));
+      const start = Date.now();
+      existing.merge(incoming);
+      expect(existing.versions).to.have.length(size * 2);
+      expect(Date.now() - start).to.be.lessThan(2000);
+    });
+  });
+});

package/models/version-history.ts

@@ -169,8 +169,8 @@ export default class VersionHistory extends BitObject {
   merge(versionHistory: VersionHistory) {
     const existingHashes = this.getAllHashesAsString();
     const incomingHashes = versionHistory.getAllHashesAsString();
-    const hashesInExistingOnly = difference(existingHashes, incomingHashes);
-    const versionsDataOnExistingOnly = this.versions.filter((v) => hashesInExistingOnly.includes(v.hash.toString()));
+    const hashesInExistingOnly = new Set(difference(existingHashes, incomingHashes));
+    const versionsDataOnExistingOnly = this.versions.filter((v) => hashesInExistingOnly.has(v.hash.toString()));
     const newVersions = [...versionHistory.versions, ...versionsDataOnExistingOnly];
     this.versionsObj = this.versionParentsToObject(newVersions);
   }

package/objects/object-list-to-graph.ts

@@ -3,7 +3,7 @@ import { uniqBy } from 'lodash';
 import type { ComponentID } from '@teambit/component-id';
 import type { ObjectList } from './object-list';
 import type { BitObjectList } from './bit-object-list';
-import { getAllVersionsInfo } from '@teambit/component.snap-distance';
+import { getAllVersionsInfo, indexVersionObjects } from '@teambit/component.snap-distance';
 
 type BitIdNode = Node<ComponentID>;
 type DependencyType = 'runtime' | 'dev' | 'peer';
@@ -24,7 +24,7 @@ export async function objectListToGraph(objectList: ObjectList): Promise<IdGraph
 export async function bitObjectListToGraph(bitObjectsList: BitObjectList): Promise<IdGraph> {
   const exportMetadata = bitObjectsList.getExportMetadata();
   const components = bitObjectsList.getComponents();
-  const versions = bitObjectsList.getVersions();
+  const versionObjectsByHash = indexVersionObjects(bitObjectsList.getVersions());
   const nodes: BitIdNode[] = [];
   const edges: DependencyEdge[] = [];
   await Promise.all(
@@ -35,7 +35,7 @@ export async function bitObjectListToGraph(bitObjectsList: BitObjectList): Promi
       const startFrom = compFromMetadata?.head;
       const versionsInfo = await getAllVersionsInfo({
         modelComponent: component,
-        versionObjects: versions,
+        versionObjects: versionObjectsByHash,
         startFrom,
         throws: false,
       });

package/package.json

@@ -1,59 +1,59 @@
 {
   "name": "@teambit/objects",
-  "version": "0.0.731",
+  "version": "0.0.733",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "0.0.731"
+    "version": "0.0.733"
   },
   "dependencies": {
-    "@pnpm/lockfile.types": "1100.0.19",
-    "semver": "7.7.1",
     "lodash": "4.18.1",
-    "uuid": "8.3.2",
-    "async-mutex": "0.3.1",
-    "p-map-series": "2.1.0",
     "tar-stream": "2.2.0",
+    "p-map-series": "2.1.0",
+    "async-mutex": "0.3.1",
     "fs-extra": "10.0.0",
     "glob": "13.0.0",
+    "@pnpm/lockfile.types": "1100.0.19",
+    "semver": "7.7.1",
+    "uuid": "8.3.2",
     "@teambit/harmony": "0.4.12",
     "@teambit/harmony.modules.runtimes": "0.0.4",
     "@teambit/component-id": "1.2.5",
+    "@teambit/graph.cleargraph": "0.0.11",
+    "@teambit/harmony.modules.concurrency": "0.0.51",
+    "@teambit/legacy.logger": "0.0.71",
+    "@teambit/toolbox.promise.map-pool": "0.0.24",
+    "@teambit/legacy.constants": "0.0.50",
     "@teambit/legacy.utils": "0.0.56",
+    "@teambit/toolbox.crypto.sha1": "0.0.24",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.55",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.22",
     "@teambit/lane-id": "0.0.312",
     "@teambit/legacy.cli.error": "0.0.72",
-    "@teambit/legacy.constants": "0.0.50",
-    "@teambit/legacy.logger": "0.0.71",
-    "@teambit/toolbox.crypto.sha1": "0.0.24",
-    "@teambit/harmony.modules.concurrency": "0.0.51",
+    "@teambit/component.sources": "0.0.245",
     "@teambit/legacy-bit-id": "1.1.4",
     "@teambit/legacy-component-log": "0.0.434",
-    "@teambit/pkg.modules.semver-helper": "0.0.38",
-    "@teambit/toolbox.array.duplications-finder": "0.0.19",
-    "@teambit/toolbox.promise.map-pool": "0.0.24",
-    "@teambit/graph.cleargraph": "0.0.11",
-    "@teambit/bit.get-bit-version": "0.0.31",
-    "@teambit/harmony.modules.in-memory-cache": "0.0.55",
-    "@teambit/toolbox.fs.remove-empty-dir": "0.0.22",
-    "@teambit/harmony.modules.get-basic-log": "0.0.197",
-    "@teambit/component.snap-distance": "0.0.193",
-    "@teambit/config-store": "0.0.308",
-    "@teambit/legacy.scope": "0.0.196",
-    "@teambit/component.sources": "0.0.245",
     "@teambit/legacy.consumer-component": "0.0.194",
     "@teambit/legacy.consumer-config": "0.0.193",
     "@teambit/legacy.extension-data": "0.0.195",
-    "@teambit/semantics.doc-parser": "0.0.201"
+    "@teambit/pkg.modules.semver-helper": "0.0.38",
+    "@teambit/toolbox.array.duplications-finder": "0.0.19",
+    "@teambit/bit.get-bit-version": "0.0.31",
+    "@teambit/semantics.doc-parser": "0.0.201",
+    "@teambit/component.snap-distance": "0.0.194",
+    "@teambit/legacy.scope": "0.0.197",
+    "@teambit/harmony.modules.get-basic-log": "0.0.198",
+    "@teambit/config-store": "0.0.309"
   },
   "devDependencies": {
-    "@types/semver": "7.5.8",
     "@types/lodash": "4.14.165",
-    "@types/uuid": "8.3.4",
     "@types/fs-extra": "9.0.7",
+    "@types/semver": "7.5.8",
+    "@types/uuid": "8.3.4",
     "@teambit/harmony.envs.core-aspect-env": "2.1.2"
   },
   "peerDependencies": {