Merge development

1 files changed, 14 insertions, 6 deletions

diff --git a/packages/sol-resolver/src/resolvers/npm_resolver.ts b/packages/sol-resolver/src/resolvers/npm_resolver.ts
index a2df0dcad..3c1d09557 100644
--- a/packages/sol-resolver/src/resolvers/npm_resolver.ts
+++ b/packages/sol-resolver/src/resolvers/npm_resolver.ts
@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import * as _ from 'lodash';
 import * as path from 'path';
 
 import { ContractSource } from '../types';
@@ -13,18 +14,25 @@ export class NPMResolver extends Resolver {
     }
     public resolveIfExists(importPath: string): ContractSource | undefined {
         if (!importPath.startsWith('/')) {
-            const [packageName, ...other] = importPath.split('/');
+            let packageName;
+            let packageScopeIfExists;
+            let other;
+            if (_.startsWith(importPath, '@')) {
+                [packageScopeIfExists, packageName, ...other] = importPath.split('/');
+            } else {
+                [packageName, ...other] = importPath.split('/');
+            }
             const pathWithinPackage = path.join(...other);
             let currentPath = this._packagePath;
             const ROOT_PATH = '/';
             while (currentPath !== ROOT_PATH) {
-                const lookupPath = path.join(currentPath, 'node_modules', packageName, pathWithinPackage);
+                const packagePath = _.isUndefined(packageScopeIfExists)
+                    ? packageName
+                    : path.join(packageScopeIfExists, packageName);
+                const lookupPath = path.join(currentPath, 'node_modules', packagePath, pathWithinPackage);
                 if (fs.existsSync(lookupPath) && fs.lstatSync(lookupPath).isFile()) {
                     const fileContent = fs.readFileSync(lookupPath).toString();
-                    return {
-                        source: fileContent,
-                        path: lookupPath,
-                    };
+                    return { source: fileContent, path: importPath, absolutePath: lookupPath };
                 }
                 currentPath = path.dirname(currentPath);
             }