Implement Lanes and Snaps features

.eslintrc.js

@@ -54,7 +54,7 @@ module.exports = {
     'promise/always-return': 'off',
     'promise/no-nesting': 'off',
     // END ERRORS OF 'plugin:promise/recommended'
-
+    'import/prefer-default-export': 'off', // typescript works better without default export
     'import/export': 'off', // typescript does allow multiple export default when overloading. not sure why it's enabled here. rule source: https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/export.md
     'prefer-object-spread': 'off',
     'import/no-duplicates': 'off',

e2e/commands/add.e2e.1.ts

@@ -691,7 +691,7 @@ describe('bit add command', function() {
           helper.command.addComponent('bar/*');
         });
         it('should generate a short id out of the directory only', () => {
-          const bitMap = helper.bitMap.readWithoutVersion();
+          const bitMap = helper.bitMap.readComponentsMapOnly();
           const ids = Object.keys(bitMap);
           expect(ids).to.include('baz1');
           expect(ids).to.include('baz2');
@@ -703,7 +703,7 @@ describe('bit add command', function() {
           helper.command.addComponent('bar/baz1/foo.js bar/baz2/foo.js');
         });
         it('should generate id out of the directory and the filename to not have a conflict', () => {
-          const bitMap = helper.bitMap.readWithoutVersion();
+          const bitMap = helper.bitMap.readComponentsMapOnly();
           const ids = Object.keys(bitMap);
           expect(ids).to.include('baz1/foo');
           expect(ids).to.include('baz2/foo');

e2e/commands/export.e2e.1.ts

@@ -383,14 +383,17 @@ describe('bit export command', function() {
       const isType = helper.command.catComponent(`${helper.scopes.remote}/utils/is-type@0.0.2`, remote2Path);
       expect(isType).to.have.property('files');
     });
+    // @todo: this fails when lane features is enabled because it has "parents" and this "parents"
+    // causes dependencies to be fetched completely.
     it('should not have is-type@0.0.1 on that remote', () => {
       let isType;
       try {
         isType = helper.command.catComponent(`${helper.scopes.remote}/utils/is-type@0.0.1`, remote2Path);
       } catch (err) {
         isType = err.toString();
       }
-      expect(isType).to.have.string('component was not found');
+      expect(isType).to.have.string('component');
+      expect(isType).to.have.string('was not found');
     });
     describe('export a component is-string1 with a dependency is-type of version 0.0.1', () => {
       before(() => {

e2e/commands/log.e2e.1.ts

@@ -25,6 +25,8 @@ describe('bit log', function() {
       helper.scopeHelper.addRemoteScope();
       helper.command.importComponent('bar/foo');
     });
+    // @todo: this fails when lane features is enabled because it has "parents" and this "parents"
+    // causes dependencies to be fetched completely.
     it('should not throw an error and should indicate that that version has no data', () => {
       const output = helper.command.log('utils/is-string');
       expect(output).to.have.string('0.0.1');

e2e/commands/status.e2e.2.ts

@@ -634,7 +634,7 @@ describe('bit status command', function() {
       // an intermediate step, make sure bar/foo is before utils/is-string
       // so then when bit-javascript resolves dependencies of utils/is-string it finds them in the
       // cache
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       const components = Object.keys(bitMap);
       expect(components[0]).to.equal('bar/foo');
       expect(components[1]).to.equal('utils/is-string');

e2e/commands/untrack.e2e.2.ts

@@ -50,7 +50,7 @@ describe('bit untrack command', function() {
       helper.fs.createFile('bar', 'foo2.js');
       helper.command.addComponent(path.normalize('bar/foo2.js'), { i: 'bar/foo2' });
       helper.command.untrackComponent('bar/foo');
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(Object.keys(bitMap)).to.be.ofSize(1);
       expect(bitMap).to.have.property('bar/foo2');
     });
@@ -59,7 +59,7 @@ describe('bit untrack command', function() {
       helper.command.addComponent(path.normalize('bar/foo.js'), { i: 'bar/foo' });
       helper.command.tagComponent('bar/foo');
       const output = helper.command.untrackComponent('bar/foo');
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(output).to.have.string('error: unable to untrack bar/foo, please use the bit remove command.');
       expect(Object.keys(bitMap)).to.be.ofSize(1);
       expect(bitMap).to.have.property('bar/foo@0.0.1');
@@ -68,7 +68,7 @@ describe('bit untrack command', function() {
       helper.fs.createFile('bar', 'foo.js');
       helper.command.addComponent(path.normalize('bar/foo.js'), { i: 'bar' });
       helper.command.untrackComponent('bar');
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(Object.keys(bitMap)).to.be.ofSize(0);
     });
     it('Should remove 2 new components and keep tagged component', () => {
@@ -80,7 +80,7 @@ describe('bit untrack command', function() {
       helper.fs.createFile('bar', 'foo3.js');
       helper.command.addComponent(path.normalize('bar/foo3.js'), { i: 'bar/foo3' });
       helper.command.untrackComponent('bar/foo bar/foo3');
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(Object.keys(bitMap)).to.be.ofSize(1);
       expect(bitMap).to.have.property('bar/foo2@0.0.1');
     });
@@ -93,7 +93,7 @@ describe('bit untrack command', function() {
       helper.fs.createFile('bar', 'foo3.js');
       helper.command.addComponent(path.normalize('bar/foo3.js'), { i: 'bar/foo3' });
       helper.command.untrackComponent('', true);
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(Object.keys(bitMap)).to.be.ofSize(1);
       expect(bitMap).to.have.property('bar/foo2@0.0.1');
     });

e2e/fixtures/scopes/hash-mismatch-case/index.json

@@ -0,0 +1,10 @@
+[
+  {
+    "id": {
+      "scope": "hash-mismatch-case",
+      "name": "foo"
+    },
+    "isSymlink": false,
+    "hash": "b2eef1ea7be63c86e6cd6942125df6c1413958f7"
+  }
+]

e2e/fixtures/scopes/hash-mismatch-case/objects/5e/7d17ad3a359abce366d73caccea843a2caf361

@@ -0,0 +1 @@
+x��A@0Pk��]�Ht�%N`��tjS&!��ݾG���<&d��(ǘD�����q$����C��s�b����
���

e2e/fixtures/scopes/hash-mismatch-case/objects/6b/d019fe5dbf11a5adf2f68d0099457ad077fa8c

@@ -0,0 +1,3 @@
+x�}R�n�0� �"�a�T	ġ'TU�T=l�kp�ؑ"$Ŀw4jEӓ�ݝ��_���(q�,4�X�$�P�t1��t��r	8�R�\�d"NB���X�]ob)r��pY
+i��RQZ(SJ̳f
+tZ$b,<UК����S;7��[��绥Њ��*��},j0vs�KJc���֓6G&K�2\��X�DM!�.60���[��Y&�UVÇ@�&����hc|�3��*F1�qn�jb�8��2<�Ot*f��!5d��2�#��T�n؁�g�׿p�Q�d	������ՠf_�2 ހ���~��m������
\s�?����\��t[�u��~�뀧��jvǵ�57���:~�K��,9�

e2e/fixtures/scopes/hash-mismatch-case/objects/b2/eef1ea7be63c86e6cd6942125df6c1413958f7

@@ -0,0 +1 @@
+x�m��n� ��(�9�+��zj���a�ae#`�n�߽���������|���Hq�hA�8��$�K��ʡ\t�I�[�]��E��m���`�T�MZ�i�<]��
73]f*�Ik�)fw`7v�E��2>8�v�c��	'{��0��B˔r�8*�1������ꗭܴ��dp#��9S�G���s%�����i��F%�k��u>+��ƺ����/����ْY�h��U���y�f�

e2e/fixtures/scopes/hash-mismatch-case/scope.json

@@ -0,0 +1,5 @@
+{
+    "name": "hash-mismatch-case",
+    "remotes": {},
+    "version": "14.4.3"
+}

e2e/flows/hash-mismatch.e2e.3.ts

@@ -0,0 +1,48 @@
+import { expect } from 'chai';
+import Helper from '../../src/e2e-helper/e2e-helper';
+
+/**
+ * previously, when a Version hash was changed, you'd get an error upon importing the component
+ *
+ * ➜  bit import hash-mismatch-case/foo
+found hash mismatch of hash-mismatch-case/foo, version 0.0.1.
+  originalHash: 6bd019fe5dbf11a5adf2f68d0099457ad077fa8c.
+  currentHash: d24622f13dbbbc8b1f59535a8bea342924b8867a
+  this usually happens when a component is old and the migration script was not running or interrupted
+ *
+ * it's impossible to change the calculated hash during the e2e-tests. so we can't generate this
+ * case on the fly. instead, we prepared such a scope from advance and copied it into the fixtures
+ * directory. (at fixtures/scopes/hash-mismatch-case). this dir contains a complete bare scope that
+ * has one component "foo" and its version (0.0.1) has a hash that was calculated after some
+ * manipulation. as a result, when importing this component "foo" to a local scope, the original
+ * hash is different than the currently calculated hash.
+ * in Bit version <= 14.4.3, when importing this component, you'd get the exact same error as above.
+ * now, we expect the import to work with no errors and to save the version object into the
+ * original hash path (6b/d019fe5dbf11a5adf2f68d0099457ad077fa8c).
+ */
+describe('hash mismatch', function() {
+  this.timeout(0);
+  const helper = new Helper();
+  after(() => {
+    helper.scopeHelper.destroy();
+  });
+  describe('mismatch', () => {
+    let output: string;
+    before(() => {
+      helper.scopeHelper.reInitLocalScope();
+      helper.scopes.setRemoteScope(false, undefined, 'hash-mismatch-case');
+      helper.scopeHelper.reInitRemoteScope();
+      helper.scopeHelper.addRemoteScope();
+      helper.fixtures.copyFixtureDir('scopes/hash-mismatch-case/', helper.scopes.remotePath);
+      output = helper.command.importComponent('foo');
+    });
+    it('should be able to import the component', () => {
+      expect(output).to.have.string('successfully imported one component');
+    });
+    it('should save the Version object into the original hash', () => {
+      const objectsFiles = helper.fs.getObjectFiles();
+      expect(objectsFiles).to.have.lengthOf(4);
+      expect(objectsFiles).to.deep.include(`6b/d019fe5dbf11a5adf2f68d0099457ad077fa8c`);
+    });
+  });
+});

e2e/functionalities/components-index.e2e.2.ts

@@ -14,17 +14,6 @@ describe('scope components index mechanism', function() {
   after(() => {
     helper.scopeHelper.destroy();
   });
-  describe('when a scope has no components', () => {
-    before(() => {
-      helper.scopeHelper.reInitLocalScope();
-      helper.command.listLocalScope();
-    });
-    it('the index.json file should be an empty array', () => {
-      expect(helper.general.indexJsonPath()).to.be.a.file();
-      const indexJson = helper.general.getIndexJson();
-      expect(indexJson).to.deep.equal([]);
-    });
-  });
   describe('after tagging a component', () => {
     before(() => {
       helper.scopeHelper.setNewLocalAndRemoteScopes();
@@ -33,7 +22,7 @@ describe('scope components index mechanism', function() {
       helper.fixtures.tagComponentBarFoo();
     });
     it('should save the component in the index.json file', () => {
-      const indexJson = helper.general.getIndexJson();
+      const indexJson = helper.general.getComponentsFromIndexJson();
       expect(indexJson).to.have.lengthOf(1);
       const indexItem = indexJson[0];
       expect(indexItem).to.have.property('id');
@@ -48,12 +37,12 @@ describe('scope components index mechanism', function() {
         helper.command.exportAllComponents();
       });
       it('should create a new record with the new scope', () => {
-        const indexJson = helper.general.getIndexJson();
+        const indexJson = helper.general.getComponentsFromIndexJson();
         const scopes = indexJson.map(item => item.id.scope);
         expect(scopes).to.contain(helper.scopes.remote);
       });
       it('should change the previous record to be a symlink', () => {
-        const indexJson = helper.general.getIndexJson();
+        const indexJson = helper.general.getComponentsFromIndexJson();
         const indexItem = indexJson.find(item => !item.id.scope);
         expect(indexItem.isSymlink).to.be.true;
       });
@@ -68,7 +57,7 @@ describe('scope components index mechanism', function() {
           helper.command.removeComponent('bar/foo', '-s');
         });
         it('should remove the record from index.json', () => {
-          const indexJson = helper.general.getIndexJson();
+          const indexJson = helper.general.getComponentsFromIndexJson();
           expect(indexJson).to.have.lengthOf(0);
         });
         it('bit list should show zero components', () => {
@@ -83,15 +72,15 @@ describe('scope components index mechanism', function() {
           helper.command.importComponent('bar/foo');
         });
         it('should populate the index.json', () => {
-          const indexJson = helper.general.getIndexJson();
+          const indexJson = helper.general.getComponentsFromIndexJson();
           expect(indexJson).to.have.lengthOf(1);
         });
         describe('removing the component', () => {
           before(() => {
             helper.command.removeComponent('bar/foo', '-s');
           });
           it('should remove the record from index.json', () => {
-            const indexJson = helper.general.getIndexJson();
+            const indexJson = helper.general.getComponentsFromIndexJson();
             expect(indexJson).to.have.lengthOf(0);
           });
           it('bit list should show zero components', () => {
@@ -128,7 +117,7 @@ describe('scope components index mechanism', function() {
         helper.command.runCmd('bit init --reset');
       });
       it('should rebuild index.json with the missing components', () => {
-        const indexJson = helper.general.getIndexJson();
+        const indexJson = helper.general.getComponentsFromIndexJson();
         expect(indexJson).to.have.lengthOf(1);
       });
       it('bit list should show 1 component', () => {
@@ -144,14 +133,14 @@ describe('scope components index mechanism', function() {
         helper.fixtures.createComponentBarFoo();
         helper.fixtures.addComponentBarFoo();
         helper.command.tagAllComponents();
-        const indexJsonWithBarFoo = helper.general.getIndexJson();
+        const indexJsonWithBarFoo = helper.general.getComponentsFromIndexJson();
         helper.command.untag('bar/foo');
         helper.general.writeIndexJson(indexJsonWithBarFoo);
         // now, index.json has barFoo, however the scope doesn't have it
       });
       it('bit status should throw an error for the first time and then should work on the second run', () => {
         // used to show "Cannot read property 'scope' of null"
-        const error = new OutdatedIndexJson('bar/foo', helper.general.indexJsonPath());
+        const error = new OutdatedIndexJson('component "bar/foo"', helper.general.indexJsonPath());
         const statusCmd = () => helper.command.status();
         helper.general.expectToThrow(statusCmd, error);
 

e2e/functionalities/dynamic-namespaces.e2e.3.ts

@@ -86,7 +86,7 @@ describe('dynamic namespaces', function() {
     it('should throw an error and not allow the import', () => {
       const output = helper.general.runWithTryCatch(`bit import ${helper.scopes.remote}/foo`);
       expect(output).to.have.string('unable to import');
-      const bitMap = helper.bitMap.readWithoutVersion();
+      const bitMap = helper.bitMap.readComponentsMapOnly();
       expect(Object.keys(bitMap)).to.have.lengthOf(1);
     });
     it('should throw an error also after tagging', () => {

e2e/functionalities/merge.e2e.3.ts

@@ -45,7 +45,7 @@ describe('merge functionality', function() {
         { id: `${helper.scopes.remote}/bar/foo`, versions: ['0.0.2'] },
         { id: `${helper.scopes.remote}/bar2/foo2`, versions: ['0.0.2'] }
       ];
-      const error = new MergeConflictOnRemote(idsAndVersions);
+      const error = new MergeConflictOnRemote(idsAndVersions, []);
       helper.general.expectToThrow(exportFunc, error);
     });
     it('should throw MergeConflict error when importing the component', () => {

e2e/functionalities/symlink-object-without-component.e2e.3.ts

@@ -1,4 +1,3 @@
-import R from 'ramda';
 import chai, { expect } from 'chai';
 import Helper from '../../src/e2e-helper/e2e-helper';
 import { DIAGNOSIS_NAME } from '../../src/doctor/core-diagnoses/orphan-symlink-objects';
@@ -38,8 +37,8 @@ describe('scope with a symlink object reference to a non-exist component', funct
     expect(scopeAfterDelete).to.have.lengthOf(1);
 
     const indexJson = helper.general.getIndexJson();
-    const componentIndex = indexJson.filter(i => i.isSymlink === false);
-    helper.general.writeIndexJson(R.without(componentIndex, indexJson));
+    const componentIndex = indexJson.components.filter(i => i.isSymlink === true);
+    helper.general.writeIndexJson(componentIndex);
   });
   it('bit import should throw a descriptive error', () => {
     const output = helper.general.runWithTryCatch('bit import bar/foo');

fixtures/component-model-object.json

@@ -0,0 +1,24 @@
+{
+  "name": "bar/foo",
+  "scope": "remote-scope",
+  "versions": {
+      "0.0.1": "125a37bdb17220bdc1406a9a28a3dde4eec91225"
+  },
+  "lang": "javascript",
+  "deprecated": false,
+  "bindingPrefix": "@bit",
+  "remotes": [
+      {
+          "url": "file:///tmp/remote-scope",
+          "name": "remote-scope",
+          "date": "1572532837438"
+      }
+  ],
+  "state": {
+      "versions": {
+          "0.0.1": {
+              "local": true
+          }
+      }
+  }
+}

src/api/consumer/index.ts

@@ -4,6 +4,7 @@ import remove from './lib/remove';
 import { deprecate, undeprecate } from './lib/deprecation';
 import { listScope } from './lib/list-scope';
 import { tagAction, tagAllAction } from './lib/tag';
+import { snapAction } from './lib/snap';
 import status from './lib/status';
 import { build, buildAll } from './lib/build';
 import importAction from './lib/import';
@@ -31,6 +32,9 @@ import dependencyStatus from './lib/dependency_status';
 import login from './lib/login';
 import show from './lib/show';
 import paintGraph from './lib/paint-graph';
+import lane from './lib/lane';
+import switchAction from './lib/switch';
+import fetch from './lib/fetch';
 
 export {
   init,
@@ -44,6 +48,7 @@ export {
   listScope,
   tagAction,
   tagAllAction,
+  snapAction,
   status,
   build,
   importAction,
@@ -70,5 +75,8 @@ export {
   ejectAction,
   login,
   show,
-  paintGraph
+  paintGraph,
+  lane,
+  switchAction,
+  fetch
 };

src/api/consumer/lib/build.ts

@@ -21,7 +21,10 @@ export async function build(
 
 export async function buildAll(noCache: boolean, verbose: boolean): Promise<Record<string, any>> {
   const consumer: Consumer = await loadConsumer();
-  const authoredAndImportedIds = consumer.bitMap.getAllBitIds([COMPONENT_ORIGINS.IMPORTED, COMPONENT_ORIGINS.AUTHORED]);
+  const authoredAndImportedIds = consumer.bitMap.getAllIdsAvailableOnLane([
+    COMPONENT_ORIGINS.IMPORTED,
+    COMPONENT_ORIGINS.AUTHORED
+  ]);
   if (R.isEmpty(authoredAndImportedIds)) {
     return {};
   }