access module through AppManager

remix-resolve/src/resolve.ts

@@ -33,7 +33,7 @@ interface Handler {
 export class RemixResolveApi implements API<RemixResolve> {
   public readonly type = 'remix-resolve'
 
-  previouslyHandled: PreviouslyHandledImports
+  private previouslyHandled: PreviouslyHandledImports
   constructor() {
     this.previouslyHandled = {}
   }
@@ -134,105 +134,3 @@ export class RemixResolveApi implements API<RemixResolve> {
     return imported
   }
 }
-
-export class ImportResolver {
-  previouslyHandled: PreviouslyHandledImports
-  constructor() {
-    this.previouslyHandled = {}
-  }
-  /**
-  * Handle an import statement based on github
-  * @params root The root of the github import statement
-  * @params filePath path of the file in github
-  */
-  handleGithubCall(root: string, filePath: string) {
-    return
-  }
-  /**
-  * Handle an import statement based on http
-  * @params url The url of the import statement
-  * @params cleanURL
-  */
-  handleHttp(url: string, cleanURL: string) {
-    return
-  }
-  /**
-  * Handle an import statement based on https
-  * @params url The url of the import statement
-  * @params cleanURL
-  */
-  handleHttps(url: string, cleanURL: string) {
-    return
-  }
-  handleSwarm(url: string, cleanURL: string) {
-    return
-  }
-  /**
-  * Handle an import statement based on IPFS
-  * @params url The url of the IPFS import statement
-  */
-  async handleIPFS(url: string) {
-    // replace ipfs:// with /ipfs/
-    url = url.replace(/^ipfs:\/\/?/, 'ipfs/')
-    try {
-      const req = 'https://gateway.ipfs.io/' + url
-      // If you don't find greeter.sol on ipfs gateway use local
-      // const req = 'http://localhost:8080/' + url
-      const response = await axios.get(req)
-      return response.data
-    } catch (e) {
-      throw e
-    }
-  }
-  handleLocal(root: string, filePath: string) {
-    return
-  }
-  getHandlers(): Handler[] {
-    return [
-      {
-        type: 'github',
-        match: (url) => { return /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/.exec(url) },
-        handle: (match) => this.handleGithubCall(match[3], match[4])
-      },
-      {
-        type: 'http',
-        match: (url) => { return /^(http?:\/\/?(.*))$/.exec(url) },
-        handle: (match) => this.handleHttp(match[1], match[2])
-      },
-      {
-        type: 'https',
-        match: (url) => { return /^(https?:\/\/?(.*))$/.exec(url) },
-        handle: (match) => this.handleHttps(match[1], match[2])
-      },
-      {
-        type: 'swarm',
-        match: (url) => { return /^(bzz-raw?:\/\/?(.*))$/.exec(url) },
-        handle: (match) => this.handleSwarm(match[1], match[2])
-      },
-      {
-        type: 'ipfs',
-        match: (url) => { return /^(ipfs:\/\/?.+)/.exec(url) },
-        handle: (match) => this.handleIPFS(match[1])
-      }
-    ]
-  }
-  async resolve(filePath: string, customHandlers?: Handler[]): Promise<Imported> {
-    var imported: Imported = this.previouslyHandled[filePath]
-    if(imported) {
-      return imported
-    }
-    const builtinHandlers: Handler[] = this.getHandlers()
-    const handlers: Handler[] = customHandlers ? [...builtinHandlers, ...customHandlers] : [...builtinHandlers]
-    const matchedHandler = handlers.filter(handler => handler.match(filePath))
-    const handler: Handler = matchedHandler[0]
-    const match = handler.match(filePath)
-    const content: string = await handler.handle(match)
-    imported = {
-      content,
-      cleanURL: filePath,
-      type: handler.type
-    }
-    this.previouslyHandled[filePath] = imported
-    return imported
-  }
-}

remix-resolve/tests/test.ts

@@ -1,8 +1,8 @@
-import { RemixResolve, ImportResolver, RemixResolveApi } from '../src'
+import { RemixResolve, RemixResolveApi } from '../src'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as assert from 'assert'
-import { Plugin, AppManager, PluginProfile } from 'remix-plugin'
+import { AppManager, PluginProfile } from 'remix-plugin'
 
 const RemixResolveProfile: PluginProfile<RemixResolve> = {
   type: 'remix-resolve',
@@ -19,11 +19,19 @@ interface IAppManager {
 describe('testRunner', () => {
   describe('#resolve', () => {
     describe('test example_1 [local imports]]', () => {
+      // AppManager tests
+      describe('test with AppManager', () => {
+        let app: AppManager<IAppManager>
+        let api: RemixResolveApi
+
         const fileName = '../remix-resolve/tests/example_1/greeter.sol'
-      let results = {}
+        let results: object = {}
 
         before(done => {
-        let resolver: ImportResolver = new ImportResolver()
+          api = new RemixResolveApi()
+          app = new AppManager({
+            modules: [{ json: RemixResolveProfile, api }]
+          })
 
           function handleLocal(pathString: string, filePath: string) {
             // if no relative/absolute path given then search in node_modules folder
@@ -44,7 +52,8 @@ describe('testRunner', () => {
               handle: (match: Array<string>) => { return handleLocal(match[2], match[3]) }
             }
           ]
-        resolver.resolve(fileName, localFSHandler)
+          //app.calls[api.type].resolve(fileName, localFSHandler)
+          api.resolve(fileName, localFSHandler)
             .then(sources => {
               results = sources
               done()
@@ -53,9 +62,8 @@ describe('testRunner', () => {
               throw e
             })
         })
-
+        it('Plugin should be added to app', () => {
-      it('should have 3 items', () => {
+          assert.equal(typeof(app.calls[api.type].resolve), 'function')
-        assert.equal(Object.keys(results).length, 3)
         })
 
         it('should returns contract content of given local path', () => {
@@ -66,23 +74,6 @@ describe('testRunner', () => {
           }
           assert.deepEqual(results, expt)
         })
-
-      // test IPFShandle
-
-      // AppManager tests
-      describe('test with AppManager', () => {
-        let app: AppManager<IAppManager>
-        let api: RemixResolveApi
-
-        before(() => {
-          api = new RemixResolveApi()
-          app = new AppManager({
-            modules: [{ json: RemixResolveProfile, api }]
-          })
-        })
-        it('Plugin should be added to app', () => {
-          assert.equal(typeof(app.calls[api.type].resolve), 'function')
-        })
       })
     })
   })