Handle packages from organizations on link

packages/cli/src/models/dependency/Dependency.ts

@@ -31,7 +31,7 @@ export default class Dependency {
   private _projectFile: ProjectFile;
 
   public static fromNameWithVersion(nameAndVersion: string): Dependency {
-    const [name, version] = nameAndVersion.split('@');
+    const [name, version] = this.splitNameAndVersion(nameAndVersion);
     return new this(name, version);
   }
 
@@ -55,7 +55,7 @@ export default class Dependency {
     const networkDependencies = new NetworkFile(null, network, networkFileName).dependencies;
     const hasDependenciesForDeploy = dependencies.find(
       (depNameAndVersion): any => {
-        const [name, version] = depNameAndVersion.split('@');
+        const [name, version] = this.splitNameAndVersion(depNameAndVersion);
         const dependency = new Dependency(name);
         const networkFilePath = dependency.getExistingNetworkFilePath(network);
         const projectDependency = networkDependencies[name];
@@ -74,6 +74,15 @@ export default class Dependency {
     return this.fromNameWithVersion(nameAndVersion);
   }
 
+  public static splitNameAndVersion(nameAndVersion: string): [string, string] {
+    const parts = nameAndVersion.split('@');
+    if (parts[0].length === 0) {
+      parts.shift();
+      parts[0] = `@${parts[0]}`;
+    }
+    return [parts[0], parts[1]];
+  }
+
   public constructor(name: string, requirement?: string | semver.Range) {
     this.name = name;
     this._networkFiles = {};

packages/cli/test/models/Dependency.test.js

@@ -30,6 +30,28 @@ contract('Dependency', function([_, from]) {
       });
     });
 
+    describe('#splitNameAndVersion', function () {
+      it('parses package name', function () {
+        Dependency.splitNameAndVersion('foo').should.deep.eq(['foo', undefined]);
+      });
+
+      it('parses package name and version', function () {
+        Dependency.splitNameAndVersion('[email protected]').should.deep.eq(['foo', '1.2.3']);
+      });
+
+      it('parses organization package', function () {
+        Dependency.splitNameAndVersion('@org/foo').should.deep.eq(['@org/foo', undefined]);
+      });
+
+      it('parses organization package with version', function () {
+        Dependency.splitNameAndVersion('@org/[email protected]').should.deep.eq(['@org/foo', '1.2.3']);
+      });
+
+      it('parses organization package with version and prerelease tag', function () {
+        Dependency.splitNameAndVersion('@org/[email protected]').should.deep.eq(['@org/foo', '1.2.3-rc.1']);
+      });
+    });
+
     describe('#install', function() {
       it('calls npm install', async function() {
         const npmInstallStub = sinon.stub(npm, 'install');