Remove exclusion of TS 2 options, support lib (#449)

Author: nicknisi

src/lib/utils/options/declaration.ts

@@ -95,12 +95,13 @@ export class OptionDeclaration {
                 const map = this.map;
                 if (map !== 'object') {
                     const key = value ? (value + '').toLowerCase() : '';
+                    const values = Object.keys(map).map(key => map[key]);
 
-                    if (map instanceof Map && map.has(key)) {
-                        value = map.get(key);
+                    if (map instanceof Map) {
+                        value = map.has(key) ? map.get(key) : key;
                     } else if (key in map) {
                         value = map[key];
-                    } else if (errorCallback) {
+                    } else if (values.indexOf(value) === -1 && errorCallback) {
                         if (this.mapError) {
                             errorCallback(this.mapError);
                         } else {

src/lib/utils/options/options.ts

@@ -133,9 +133,6 @@ export class Options extends ChildableComponent<Application, OptionsComponent> {
     setValue(name: string|OptionDeclaration, value: any, errorCallback?: Function) {
         const declaration = name instanceof OptionDeclaration ? name : this.getDeclaration(<string> name);
         if (!declaration) {
-            if (errorCallback) {
-                errorCallback('Unknown option `%s`.', name.toString());
-            }
             return;
         }
 
@@ -152,7 +149,7 @@ export class Options extends ChildableComponent<Application, OptionsComponent> {
             const value = obj[key];
             const declaration = this.getDeclaration(key);
             const shouldValueBeAnObject = declaration && declaration['map'] === 'object';
-            if (typeof value === 'object' && !shouldValueBeAnObject) {
+            if (!Array.isArray(value) && typeof value === 'object' && !shouldValueBeAnObject) {
                 this.setValues(value, prefix + key + '.', errorCallback);
             } else {
                 this.setValue(prefix + key, value, errorCallback);

src/lib/utils/options/readers/tsconfig.ts

@@ -51,31 +51,30 @@ export class TSConfigReader extends OptionsComponent {
             return;
         }
 
-        let data = ts.readConfigFile(fileName, ts.sys.readFile).config;
-        if (data === undefined) {
+        const { config } = ts.readConfigFile(fileName, ts.sys.readFile);
+        if (config === undefined) {
             event.addError('The tsconfig file %s does not contain valid JSON.', fileName);
             return;
         }
-        if (!_.isPlainObject(data)) {
+        if (!_.isPlainObject(config)) {
             event.addError('The tsconfig file %s does not contain a JSON object.', fileName);
             return;
         }
 
-        data = ts.parseJsonConfigFileContent(
-            data,
+        const { fileNames, options, raw: { typedocOptions }} = ts.parseJsonConfigFileContent(
+            config,
             ts.sys,
             Path.resolve(Path.dirname(fileName)),
             {},
             Path.resolve(fileName));
 
-        event.inputFiles = data.fileNames;
+        event.inputFiles = fileNames;
 
         const ignored = TypeScriptSource.IGNORED;
-        let compilerOptions = _.clone(data.raw.compilerOptions);
         for (const key of ignored) {
-            delete compilerOptions[key];
+            delete options[key];
         }
 
-        _.defaults(event.data, data.raw.typedocOptions, compilerOptions);
+        _.defaults(event.data, typedocOptions, options);
     }
 }

src/lib/utils/options/sources/typescript.ts

@@ -15,11 +15,7 @@ export class TypeScriptSource extends OptionsComponent {
     static IGNORED: string[] = [
         'out', 'version', 'help',
         'watch', 'declaration', 'mapRoot',
-        'sourceMap', 'inlineSources', 'removeComments',
-        // Ignore new TypeScript 2.0 options until typedoc can't manage it.
-        'lib', 'noImplicitThis',
-        'traceResolution', 'noUnusedParameters', 'noUnusedLocals',
-        'skipLibCheck', 'declarationDir', 'types', 'typeRoots'
+        'sourceMap', 'inlineSources', 'removeComments'
     ];
 
     initialize() {
@@ -59,6 +55,9 @@ export class TypeScriptSource extends OptionsComponent {
             case 'string':
                 param.type = ParameterType.String;
                 break;
+            case 'list':
+                param.type = ParameterType.Array;
+                break;
             default:
                 param.type = ParameterType.Map;
                 param.map = option.type;

src/test/renderer/specs/classes/_access_.privateclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.baseclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.genericclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.internalclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.nongenericclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.subclassa.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_classes_.subclassb.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_default_export_.defaultexportedclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_default_export_.notexportedclassname.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_flattened_.flattenedclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_single_export_.notexportedclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_single_export_.singleexportedclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_typescript_1_3_.classwithprotectedmembers.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_typescript_1_3_.subclasswithprotectedmembers.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/classes/_typescript_1_4_.simpleclass.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/enums/_enumerations_.directions.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/enums/_enumerations_.size.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/globals.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_classes_.inameinterface.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_classes_.iprintinterface.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_classes_.iprintnameinterface.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_generics_.a.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_generics_.ab.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_generics_.abnumber.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_generics_.abstring.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_generics_.b.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/interfaces/_typescript_1_4_.runoptions.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_access_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_access_.privatemodule.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_classes_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_default_export_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_enumerations_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_flattened_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_functions_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_functions_.modulefunction.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_generics_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_modules_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_modules_.mymodule.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_modules_.mymodule.mysubmodule.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_single_export_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_typescript_1_3_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">

src/test/renderer/specs/modules/_typescript_1_4_.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html class="default no-js">
+<html class="default">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">