Feature/dynamic namespaces (teambit#1151)

* support dynamic namespaces (replaced the box+name format with a dynamic name that can have multiple slashes to indicate a hierarchical namespace)

* performance improvement - do not loadFromFileSystem the same component twice

* prevent importing different components with scope+name equals to a local name

Author: David First

.eslintignore-circle

@@ -15,7 +15,6 @@ specs/scope/migrations/objectsFixtures/simple-component.js
 specs/specs-runner/fixtures/invalid-tester.js
 src/api/consumer/lib/isolate.js
 src/api/consumer/lib/migrate.js
-src/api/consumer/lib/untrack.js
 src/api/scope/lib/deprecate.js
 src/api/scope/lib/modify-ci-props.js
 src/cli/command-registrar-builder.js
@@ -50,7 +49,6 @@ src/cli/cli-utils.js
 src/cli/command.js
 src/cli/commands/private-cmds/_fetch-cmd.js
 src/cli/commands/private-cmds/scope-config-cmd.js
-src/cli/commands/public-cmds/commit-cmd.js
 src/cli/commands/public-cmds/config-cmd.js
 src/cli/commands/public-cmds/list-cmd.js
 src/cli/commands/public-cmds/logout-cmd.js
@@ -68,7 +66,6 @@ src/utils/array/filter-async.js
 src/utils/buffer/from.js
 src/utils/path.js
 src/api/scope/lib/put.js
-src/bit-id/bit-ids.js
 src/cli/commands/private-cmds/ci-update-cmd.js
 src/consumer/specs-results/specs-results.js
 src/driver/driver.js
@@ -92,7 +89,6 @@ src/cli/templates/docs-template.js
 src/consumer/component/sources/source-file.js
 src/consumer/migrations/consumer-migrator.js
 specs/scope/migrations/scope-migrator.spec.js
-src/bit-id/bit-id.js
 src/cli/chalk-box.js
 src/cli/commands/public-cmds/deprecate-cmd.js
 src/scope/migrations/component-version/to-semver-migration.js

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+- support dynamic namespaces (replaced the box+name format with a dynamic name that can have multiple slashes to indicate a hierarchical namespace)
+
 ## [[13.0.4] - 2018-07-24](https://github.com/teambit/bit/releases/tag/v13.0.4)
 
 ### New

e2e/bitsrc-tester.js

@@ -1,16 +1,18 @@
 import requestify from 'requestify';
 
 // const apiBaseUrl = process.env.NODE_ENV === 'production' ? 'https://api.bitsrc.io' : 'https://api-stg.bitsrc.io';
+const supportTestingOnBitsrc = false;
 const apiBaseUrl = process.env.BITSRC_ENV === 'stg' ? 'https://api-stg.bitsrc.io' : 'https://api.bitsrc.io';
 const username = process.env.testerBitsrcUsername || 'tester';
 const password = process.env.testerBitsrcPassword;
 
-export { username };
+export { username, supportTestingOnBitsrc };
 const debugMode = !!process.env.npm_config_debug;
 export default class BitsrcTester {
   cookies;
 
   init() {
+    if (!supportTestingOnBitsrc) throw new Error('supportTestingOnBitsrc is set to false');
     return requestify
       .post(`${apiBaseUrl}/user/login`, { username, password })
       .then((res) => {

e2e/commands/add.e2e.1.js

@@ -11,6 +11,7 @@ import {
   VersionShouldBeRemoved,
   MainFileIsDir
 } from '../../src/consumer/component-ops/add-components/exceptions';
+import { InvalidName } from '../../src/bit-id/exceptions';
 
 chai.use(require('chai-fs'));
 
@@ -369,38 +370,18 @@ describe('bit add command', function () {
       expect(bitMap['bar/foo1'].origin).to.equal('AUTHORED');
     });
     it('Should prevent adding a file with invalid keys in namespace', () => {
-      let errMsg;
+      const error = new InvalidName('bar.f/foo');
       helper.createComponentBarFoo();
-      const normalizedPath = path.normalize('bar/foo.js');
-      try {
-        helper.addComponentWithOptions(normalizedPath, { i: 'bar.f/foo' });
-      } catch (err) {
-        errMsg = err.message;
-      }
-      expect(errMsg).to.have.string(
-        `Command failed: ${
-          helper.bitBin
-        } add ${normalizedPath} -i bar.f/foo\nerror: "bar.f/foo" is invalid, component IDs can only contain alphanumeric, lowercase characters, and the following ["-", "_", "$", "!"]\n`
-      );
+      const addFunc = () => helper.addComponentWithOptions('bar/foo.js', { i: 'bar.f/foo' });
+      helper.expectToThrow(addFunc, error);
     });
     it('Should prevent adding a file with invalid keys in ID', () => {
-      let errMsg;
+      const error = new InvalidName('bar/fo.o');
       helper.createComponentBarFoo();
-      let normalizedPath;
-      try {
-        normalizedPath = path.normalize('bar/foo.js');
-        helper.addComponentWithOptions(normalizedPath, { i: 'bar/fo.o' });
-      } catch (err) {
-        errMsg = err.message;
-      }
-      expect(errMsg).to.have.string(
-        `Command failed: ${
-          helper.bitBin
-        } add ${normalizedPath} -i bar/fo.o\nerror: "bar/fo.o" is invalid, component IDs can only contain alphanumeric, lowercase characters, and the following ["-", "_", "$", "!"]\n`
-      );
+      const addFunc = () => helper.addComponentWithOptions('bar/foo.js', { i: 'bar/fo.o' });
+      helper.expectToThrow(addFunc, error);
     });
     it.skip('Bitmap mainFile should point to correct mainFile', () => {});
-    it.skip('should not allow adding a component with an existing box-name and component-name', () => {});
   });
   describe('adding file to existing tagged component', () => {
     let bitMap;
@@ -534,24 +515,17 @@ describe('bit add command', function () {
     });
     it('Should return error if used an invalid ID', () => {
       helper.createFile('bar', 'foo.js');
-      let errorMessage;
-      try {
-        helper.addComponentWithOptions('bar', {
-          i: 'Bar/Foo'
-        });
-      } catch (err) {
-        errorMessage = err.message;
-      }
-
-      expect(errorMessage).to.have.string('error: "Bar/Foo" is invalid, component IDs can only contain');
+      const addFunc = () => helper.addComponentWithOptions('bar/foo.js', { i: 'Bar/foo' });
+      const error = new InvalidName('Bar/foo');
+      helper.expectToThrow(addFunc, error);
     });
-    it('Should add component with global namespace if used parcial ID', () => {
+    it('should add component with id contains only one level', () => {
       helper.createFile('bar', 'foo.js');
       helper.addComponentWithOptions('bar', {
         i: 'foo'
       });
       const bitMap = helper.readBitMap();
-      expect(bitMap).to.have.property('global/foo');
+      expect(bitMap).to.have.property('foo');
     });
     it('Should add dir files with spec from multiple dsls when test files are placed in same structure', () => {
       helper.createFile('bar', 'foo.js');

e2e/commands/deprecate.e2e.1.js

@@ -41,7 +41,7 @@ describe('bit deprecate command', function () {
       expect(listOutput).to.contain.string('bar/foo [Deprecated]');
     });
     it('should export component as deprecated ', () => {
-      helper.deprecateComponent(`${helper.remoteScope}/bar/foo`);
+      helper.deprecateComponent('bar/foo');
       helper.exportAllComponents();
       output = helper.listRemoteScope(false);
       expect(output).to.contain.string('bar/foo');

e2e/commands/export.e2e.1.js

@@ -262,12 +262,12 @@ describe('bit export command', function () {
       helper.addRemoteScope();
       helper.importComponent('bar/foo');
 
-      helper.commitComponentBarFoo(); // v3
+      helper.commitComponent('bar/foo -f'); // v3
       helper.exportComponent(`${helper.remoteScope}/bar/foo`);
     });
     it('should export it with no errors', () => {
       const output = helper.listRemoteScope();
-      expect(output.includes(`${helper.remoteScope}/bar/[email protected]`)).to.be.true;
+      expect(output).to.have.string(`${helper.remoteScope}/bar/[email protected]`);
     });
   });
 
@@ -337,7 +337,7 @@ describe('bit export command', function () {
       helper.commitComponentBarFoo();
       helper.exportComponent('bar/foo');
       try {
-        output = helper.exportComponent('bar/foo');
+        output = helper.exportComponent('bar/foo', undefined, false);
       } catch (err) {
         errorOutput = err.message;
       }
@@ -346,7 +346,7 @@ describe('bit export command', function () {
       expect(output).to.be.undefined;
     });
     it('should throw an error saying the component was already exported', () => {
-      expect(errorOutput.includes('has been already exported')).to.be.true;
+      expect(errorOutput).to.have.string('has been already exported');
     });
   });
 

e2e/commands/import.e2e.1.js

@@ -29,8 +29,8 @@ describe('bit import', function () {
       // export a new simple component
       helper.createFile('global', 'simple.js');
       helper.addComponent(path.normalize('global/simple.js'));
-      helper.commitComponent('simple');
-      helper.exportComponent('simple');
+      helper.commitComponent('global/simple');
+      helper.exportComponent('global/simple');
 
       helper.reInitLocalScope();
       helper.addRemoteScope();
@@ -272,7 +272,7 @@ describe('bit import', function () {
       let output;
       before(() => {
         helper.reInitLocalScope();
-        helper.setComponentsDirInBitJson('{scope}/{namespace}-{name}');
+        helper.setComponentsDirInBitJson('{scope}/-{name}-');
         helper.addRemoteScope();
         helper.importComponent('global/simple');
         output = helper.importComponent('global/simple');
@@ -281,15 +281,15 @@ describe('bit import', function () {
         expect(output).to.have.string('successfully imported one component');
       });
       it('should import the component into new dir structure according to dsl', () => {
-        expect(path.join(helper.localScopePath, helper.remoteScope, 'global-simple')).to.be.a.directory(
+        expect(path.join(helper.localScopePath, helper.remoteScope, '-global/simple-')).to.be.a.directory(
           'should not be empty'
         ).and.not.empty;
       });
       it('bitmap should contain component with correct rootDir according to dsl', () => {
         const bitMap = helper.readBitMap();
         const cmponentId = `${helper.remoteScope}/global/[email protected]`;
         expect(bitMap).to.have.property(cmponentId);
-        expect(bitMap[cmponentId].rootDir).to.equal(`${helper.remoteScope}/global-simple`);
+        expect(bitMap[cmponentId].rootDir).to.equal(`${helper.remoteScope}/-global/simple-`);
       });
     });
   });
@@ -676,8 +676,8 @@ describe('bit import', function () {
       const simpleFixture = 'import a from "lodash.isboolean"; ';
       helper.createFile('global', 'simple.js', simpleFixture);
       helper.addComponentWithOptions('global/simple.js', { i: 'global/simple' });
-      helper.commitComponent('simple');
-      helper.exportComponent('simple');
+      helper.commitComponent('global/simple');
+      helper.exportComponent('global/simple');
 
       helper.addNpmPackage('lodash.isstring', '4.0.0');
       const withDepsFixture = 'import a from "./global/simple.js"; import c from "lodash.isstring"';
@@ -2109,8 +2109,8 @@ console.log(barFoo.default());`;
       const simpleFixture = 'import a from "lodash.isboolean"; ';
       helper.createFile('global', 'simple.js', simpleFixture);
       helper.addComponentWithOptions('global/simple.js', { i: 'global/simple' });
-      helper.commitComponent('simple');
-      helper.exportComponent('simple');
+      helper.commitComponent('global/simple');
+      helper.exportComponent('global/simple');
       helper.addNpmPackage('lodash.isstring', '4.0.0');
       const withDepsFixture = 'import a from "./global/simple.js"; import c from "lodash.isstring"';
       helper.createFile('', 'with-deps.js', withDepsFixture);
@@ -2137,7 +2137,7 @@ console.log(barFoo.default());`;
     });
     it('should contain  workspaces array in package.json  and private true', () => {
       const pkgJson = helper.readPackageJson(helper.localScopePath);
-      expect(pkgJson.workspaces).to.include('components/.dependencies/*/*/*/*', 'components/*/*');
+      expect(pkgJson.workspaces).to.include('components/.dependencies/**/*', 'components/**/*');
       expect(pkgJson.private).to.be.true;
     });
     it('component dep should be install as npm package', () => {
@@ -2152,7 +2152,7 @@ console.log(barFoo.default());`;
     it('Should not contain duplicate regex in workspaces dir if we run import again ', () => {
       helper.importComponent('comp/with-deps --override');
       const pkgJson = helper.readPackageJson(helper.localScopePath);
-      expect(pkgJson.workspaces).to.include('components/.dependencies/*/*/*/*', 'components/*/*');
+      expect(pkgJson.workspaces).to.include('components/.dependencies/**/*', 'components/**/*');
       expect(pkgJson.workspaces).to.be.ofSize(2);
       expect(path.join(helper.localScopePath, 'yarn.lock')).to.be.a.file('no yarn lock file');
     });
@@ -2166,19 +2166,15 @@ console.log(barFoo.default());`;
       helper.addKeyValueToPackageJson({ workspaces: ['comp'] });
       helper.importComponent('comp/with-deps --override');
       const pkgJson = helper.readPackageJson();
-      expect(pkgJson.workspaces).to.include(
-        'components/.dependencies/*/*/*/*',
-        'components/*/*',
-        'test/comp/with-deps'
-      );
+      expect(pkgJson.workspaces).to.include('components/.dependencies/**/*', 'components/**/*', 'test/comp/with-deps');
     });
     it('Should save workspaces with custom import path ', () => {
       helper.reInitLocalScope();
       helper.addRemoteScope(helper.remoteScopePath);
       helper.manageWorkspaces();
       helper.importComponent('comp/with-deps -p test');
       const pkgJson = helper.readPackageJson();
-      expect(pkgJson.workspaces).to.include('components/.dependencies/*/*/*/*', 'components/*/*', 'test');
+      expect(pkgJson.workspaces).to.include('components/.dependencies/**/*', 'components/**/*', 'test');
     });
   });
   describe('importing a component when it has a local tag', () => {

e2e/commands/merge.e2e.2.js

@@ -87,10 +87,11 @@ describe('bit merge command', function () {
     it('as an intermediate step, make sure the dependencies are correct', () => {
       const barFoo = helper.catComponent('bar/[email protected]');
       expect(barFoo.dependencies).to.have.lengthOf(1);
-      expect(barFoo.dependencies[0].id).to.equal('utils/[email protected]');
+      expect(barFoo.dependencies[0].id.name).to.equal('utils/is-string');
+      expect(barFoo.dependencies[0].id.version).to.equal('0.0.2');
       expect(barFoo.flattenedDependencies).to.have.lengthOf(2);
-      expect(barFoo.flattenedDependencies).to.include('utils/is-string@0.0.2');
-      expect(barFoo.flattenedDependencies).to.include('utils/is-type@0.0.2');
+      expect(barFoo.flattenedDependencies).to.deep.include({ name: 'utils/is-string', version: '0.0.2' });
+      expect(barFoo.flattenedDependencies).to.deep.include({ name: 'utils/is-type', version: '0.0.2' });
     });
     describe('as authored', () => {
       before(() => {

e2e/commands/remove.e2e.2.js

@@ -361,11 +361,6 @@ describe('bit remove command', function () {
       helper.exportComponent('utils/is-string');
       helper.exportComponent('utils/is-string2');
     });
-    it.skip('should remove component version only', () => {
-      const output = helper.removeComponent(`${helper.remoteScope}/utils/[email protected] -s`);
-      expect(output).to.contain.string('successfully removed components');
-      expect(output).to.contain.string(`${helper.remoteScope}/utils/[email protected]`);
-    });
     it('should import component is-string with no issues', () => {
       helper.reInitLocalScope();
       helper.addRemoteScope();

e2e/commands/show.e2e.2.js

@@ -129,16 +129,11 @@ describe('bit show command', function () {
       });
 
       it('should include the name correctly', () => {
-        expect(output).to.include({ name: 'comp' });
+        expect(output).to.include({ name: 'comp/comp' });
       });
 
-      it('should include the namespace correctly', () => {
-        expect(output).to.include({ box: 'comp' });
-      });
-
-      // TODO: Check again after this commit merged: 6ee69fab36f5b9f31fa576216c6bf22808d0d459
-      it.skip('should include the version correctly', () => {
-        expect(output).to.include({ version: 1 });
+      it('should include the version correctly', () => {
+        expect(output).to.include({ version: '0.0.1' });
       });
 
       // TODO: get the version dynamically
@@ -276,14 +271,18 @@ describe('bit show command', function () {
       helper.addComponentBarFoo();
       helper.commitComponentBarFoo();
       helper.exportAllComponents();
-    });
-    it('should show deprecated component', () => {
       helper.deprecateComponent(`${helper.remoteScope}/bar/foo`, '-r');
-      output = JSON.parse(helper.runCmd(`bit show ${helper.remoteScope}/bar/foo -j`));
+    });
+    it('should show the component as deprecated when using "--remote" flag', () => {
+      output = JSON.parse(helper.runCmd(`bit show ${helper.remoteScope}/bar/foo -j -r`));
       expect(output).to.include({ deprecated: true });
     });
+    it('should not show the component as deprecated when not using "--remote" flag', () => {
+      output = JSON.parse(helper.runCmd(`bit show ${helper.remoteScope}/bar/foo -j`));
+      expect(output).to.include({ deprecated: false });
+    });
   });
-  describe('show deprecated remote component', () => {
+  describe('show non-deprecated remote component', () => {
     let output;
     before(() => {
       helper.setNewLocalAndRemoteScopes();
@@ -292,7 +291,11 @@ describe('bit show command', function () {
       helper.commitComponentBarFoo();
       helper.exportAllComponents();
     });
-    it('should show regular component', () => {
+    it('should indicate a component as non-deprecated when using "--remote" flag', () => {
+      output = JSON.parse(helper.runCmd(`bit show ${helper.remoteScope}/bar/foo -j -r`));
+      expect(output).to.include({ deprecated: false });
+    });
+    it('should indicate a component as non-deprecated when not using "--remote flag', () => {
       output = JSON.parse(helper.runCmd(`bit show ${helper.remoteScope}/bar/foo -j`));
       expect(output).to.include({ deprecated: false });
     });
@@ -580,8 +583,7 @@ function add(a, b) {
       const parsedOutput = JSON.parse(output);
       expect(parsedOutput).to.be.ofSize(1);
       expect(parsedOutput[0]).to.to.include({
-        name: 'foo',
-        box: 'bar',
+        name: 'bar/foo',
         version: '0.0.1'
       });
     });