fix: fixup tests

Author: davewasmer

package.json

@@ -1,12 +1,13 @@
 {
-  "name": "documenter",
+  "name": "@denali-js/documenter",
   "version": "1.0.0",
   "description": "Generate docs data from a Javascript or Typescript project",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "npm run clean && tsc",
+    "clean": "rm -rf dist",
+    "test": "ava"
   },
   "repository": {
     "type": "git",
@@ -19,23 +20,23 @@
   },
   "homepage": "https://github.com/denali-js/documenter#readme",
   "devDependencies": {
-    "tslint": "^5.7.0",
-    "typescript": "^2.4.2"
+    "ava": "^0.25.0",
+    "tslint": "^5.9.1",
+    "typescript": "^2.7.1"
   },
   "dependencies": {
     "@types/debug": "^0.0.30",
-    "@types/glob": "^5.0.32",
-    "@types/lodash": "^4.14.74",
-    "@types/node": "^8.0.26",
+    "@types/glob": "^5.0.35",
+    "@types/lodash": "^4.14.102",
+    "@types/node": "^8.9.1",
     "@types/tmp": "^0.0.33",
     "broccoli-plugin": "^1.3.0",
-    "debug": "^3.0.1",
+    "debug": "^3.1.0",
     "glob": "^7.1.2",
-    "lodash": "^4.17.4",
-    "read-pkg": "^2.0.0",
-    "require-dir": "^0.3.2",
+    "lodash": "^4.17.5",
+    "read-pkg": "^3.0.0",
     "tmp": "^0.0.33",
-    "typedoc": "^0.8.0",
+    "typedoc": "^0.10.0",
     "walk-sync": "^0.3.2",
     "yuidocjs": "^0.10.2"
   }

src/extracter.ts

@@ -2,13 +2,17 @@ import * as path from 'path';
 import { existsSync as exists, readFileSync as read } from 'fs';
 import { defaults, Dictionary } from 'lodash';
 import * as walk from 'walk-sync';
-import * as requireDir from 'require-dir';
 import { sync as glob } from 'glob';
 import API from './api';
+import TypescriptSourceExtracter from './source-extracters/typescript';
+import JavascriptSourceExtracter from './source-extracters/javascript';
 import * as createDebug from 'debug';
 
 const debug = createDebug('documenter:extracter');
-const extractersDir = path.join(__dirname, 'extracters');
+const sourceExtracters = {
+  'typescript': TypescriptSourceExtracter,
+  'javascript': JavascriptSourceExtracter
+};
 
 export interface ExtracterOptions {
   /**
@@ -76,12 +80,24 @@ export default class Extracter {
    */
   sourceDirs: string[];
 
-  extracters = <Dictionary<{ default: ExtracterMethod }>>requireDir(extractersDir);
-
   constructor(options: ExtracterOptions) {
     defaults(options, this.defaultOptions(options.dir));
     debug(`Configuring for ${ options.dir }`);
-    Object.assign(this, options);
+    this.dir = options.dir;
+    this.pagesDir = options.pagesDir || 'docs';
+    this.sourceDirs = options.sourceDirs || [ 'src' ];
+    this.projectName = options.projectName;
+    this.projectVersion = options.projectVersion;
+
+    if (!path.isAbsolute(this.pagesDir)) {
+      this.pagesDir = path.join(this.dir, this.pagesDir);
+    }
+    this.sourceDirs = this.sourceDirs.map((d) => {
+      if (!path.isAbsolute(d)) {
+        return path.join(this.dir, d);
+      }
+      return d;
+    });
   }
 
   /**
@@ -118,10 +134,11 @@ export default class Extracter {
     if (!sourceType) {
       throw new Error('Cannot extract API docs from this directory: unknown source type. Source must be Typescript or JavaScript');
     }
-    return this.extracters[sourceType].default.call(null, this);
+    let sourceExtracter = new sourceExtracters[sourceType](this);
+    return sourceExtracter.extract();
   }
 
-  detectSourceType(): string | null {
+  detectSourceType(): 'typescript' | 'javascript' | null {
     // Typescript
     if (exists(path.join(this.dir, 'tsconfig.json'))) {
       return 'typescript';