chore(*): Linting

Author: nokome

.prettierignore

@@ -0,0 +1,5 @@
+CHANGELOG.md
+coverage
+dist
+docs
+node_modules

package.json

@@ -100,7 +100,14 @@
     }
   },
   "eslintConfig": {
-    "extends": "@stencila/eslint-config"
+    "extends": "@stencila/eslint-config",
+    "rules": {
+      "@typescript-eslint/prefer-regexp-exec": 1,
+      "@typescript-eslint/require-await": 1,
+      "@typescript-eslint/restrict-plus-operands": 1,
+      "@typescript-eslint/strict-boolean-expressions": 1,
+      "@typescript-eslint/unbound-method": 1
+    }
   },
   "husky": {
     "hooks": {

src/CachingUrlFetcher.ts

@@ -1,4 +1,4 @@
-import IUrlFetcher from './IUrlFetcher'
+import UrlFetcher from './IUrlFetcher'
 
 import { NetworkError } from './errors'
 import persist from 'node-persist'
@@ -10,7 +10,7 @@ let REQUEST_CACHE_INITIALISED = false
 /**
  * The default URL fetcher that Dockta uses. Fetches using `got` and caches results using `persist`
  */
-export default class CachingUrlFetcher implements IUrlFetcher {
+export default class CachingUrlFetcher implements UrlFetcher {
   /**
    * Fetch a URL using `got`, attempting to retrieve it from cache first.
    */

src/DockerBuilder.ts

@@ -211,7 +211,7 @@ export default class DockerBuilder {
           break
 
         case 'COPY':
-        case 'ADD':
+        case 'ADD': {
           // Add files/subdirs to the container
           const copy = instruction.args as Array<string>
           const to = copy.pop() as string
@@ -229,8 +229,8 @@ export default class DockerBuilder {
           })
           await container.putArchive(pack, { path: workdir })
           break
-
-        case 'RUN':
+        }
+        case 'RUN': {
           // Execute code in the container
           const script = instruction.args as string
           const exec = await container.exec({
@@ -251,7 +251,7 @@ export default class DockerBuilder {
             await new Promise(resolve => setTimeout(resolve, 100))
           }
           break
-
+        }
         case 'CMD':
           // Dockerfile instructions to apply when committing the image
           changes += instruction.raw + '\n\n'

src/DockerCompiler.ts

@@ -8,7 +8,7 @@ import parsers from './parsers'
 import DockerGenerator from './DockerGenerator'
 import DockerBuilder from './DockerBuilder'
 import DockerExecutor from './DockerExecutor'
-import IUrlFetcher from './IUrlFetcher'
+import UrlFetcher from './IUrlFetcher'
 
 /**
  * Compiles a project into a Dockerfile, or Docker image
@@ -17,9 +17,9 @@ export default class DockerCompiler {
   /**
    * The instance of IUrlFetcher to fetch URLs
    */
-  private readonly urlFetcher: IUrlFetcher
+  private readonly urlFetcher: UrlFetcher
 
-  constructor(urlFetcher: IUrlFetcher) {
+  constructor(urlFetcher: UrlFetcher) {
     this.urlFetcher = urlFetcher
   }
 

src/DockerExecutor.ts

@@ -62,7 +62,7 @@ export default class DockerExecutor {
     // CMD in the Dockerfile
     let cmd
     if (command) cmd = command.split(' ')
-    const container = await docker.run(name, [], [stdout, stderr], {
+    await docker.run(name, [], [stdout, stderr], {
       Cmd: cmd,
       HostConfig: {
         Binds: [`${path.resolve(folder)}:/work`]
@@ -71,7 +71,6 @@ export default class DockerExecutor {
       User: user,
       WorkingDir: '/work'
     })
-    container.remove()
 
     // Attempt to parse output as JSON
     try {

src/DockerGenerator.ts

@@ -2,7 +2,7 @@ import { SoftwareEnvironment } from '@stencila/schema'
 
 import Generator from './Generator'
 import generators from './generators'
-import IUrlFetcher from './IUrlFetcher'
+import UrlFetcher from './IUrlFetcher'
 
 const PREFERRED_UBUNTU_VERSION = '18.10'
 
@@ -61,7 +61,7 @@ export default class DockerGenerator extends Generator {
   protected generators: Array<Generator>
 
   constructor(
-    urlFetcher: IUrlFetcher,
+    urlFetcher: UrlFetcher,
     environ: SoftwareEnvironment,
     folder?: string,
     baseImage?: string

src/Doer.ts

@@ -4,7 +4,7 @@ import path from 'path'
 import tmp from 'tmp'
 
 import { PermissionError } from './errors'
-import IUrlFetcher from './IUrlFetcher'
+import UrlFetcher from './IUrlFetcher'
 
 /**
  * A utility base class for the `Parser` and `Generator` classes
@@ -19,9 +19,9 @@ export default abstract class Doer {
   /**
    * The instance of IUrlFetcher to fetch URLs
    */
-  protected readonly urlFetcher: IUrlFetcher
+  protected readonly urlFetcher: UrlFetcher
 
-  constructor(urlFetcher: IUrlFetcher, folder: string | undefined) {
+  constructor(urlFetcher: UrlFetcher, folder: string | undefined) {
     if (!folder) folder = tmp.dirSync().name
     this.folder = folder
     this.urlFetcher = urlFetcher

src/Generator.ts

@@ -1,5 +1,5 @@
 import Doer from './Doer'
-import IUrlFetcher from './IUrlFetcher'
+import UrlFetcher from './IUrlFetcher'
 
 const VERSION = require('../package').version
 const DOCKER_USER = 'guest'
@@ -14,7 +14,7 @@ export default class Generator extends Doer {
   baseImage?: string
 
   constructor(
-    urlFetcher: IUrlFetcher,
+    urlFetcher: UrlFetcher,
     folder: string | undefined,
     baseImage?: string
   ) {

src/IUrlFetcher.ts

@@ -1,7 +1,7 @@
 /**
  * Standard interface that can be used for fetching URLs
  */
-export default interface IUrlFetcher {
+export default interface UrlFetcher {
   /**
    * Fetch a URL
    *