Move models to own namespace

Author: sebastian-lenz

bin/typedoc.d.ts

@@ -84,7 +84,7 @@ module.exports = function(grunt)
         FS.readdirSync(Path.join(base)).forEach(function(directory) {
             var path = Path.join(base, directory);
             if (!FS.lstatSync(path).isDirectory()) return;
-            TypeDoc.resetReflectionID();
+            TypeDoc.models.resetReflectionID();
 
             var src = app.expandInputFiles([path]);
             var out = Path.join(base, directory, 'specs.json');

bin/typedoc.js

@@ -314,7 +314,7 @@ module td
          * @param src  A list of source that should be compiled and converted.
          * @returns An instance of ProjectReflection on success, NULL otherwise.
          */
-        public convert(src:string[]):ProjectReflection {
+        public convert(src:string[]):models.ProjectReflection {
             this.logger.writeln('Using TypeScript %s from %s', this.getTypeScriptVersion(), tsPath);
 
             var result = this.converter.convert(src);
@@ -335,7 +335,7 @@ module td
         /**
          * @param project  The project the documentation should be generated for.
          */
-        public generateDocs(project:ProjectReflection, out:string):boolean;
+        public generateDocs(project:models.ProjectReflection, out:string):boolean;
 
         /**
          * Run the documentation generator for the given set of files.
@@ -344,7 +344,7 @@ module td
          * @returns TRUE if the documentation could be generated successfully, otherwise FALSE.
          */
         public generateDocs(input:any, out:string):boolean {
-            var project = input instanceof ProjectReflection ? input : this.convert(input);
+            var project = input instanceof models.ProjectReflection ? input : this.convert(input);
             if (!project) return false;
 
             out = Path.resolve(out);
@@ -367,7 +367,7 @@ module td
         /**
          * @param project  The project that should be converted.
          */
-        public generateJson(project:ProjectReflection, out:string):boolean;
+        public generateJson(project:models.ProjectReflection, out:string):boolean;
 
         /**
          * Run the converter for the given set of files and write the reflections to a json file.
@@ -376,7 +376,7 @@ module td
          * @returns TRUE if the json file could be written successfully, otherwise FALSE.
          */
         public generateJson(input:any, out:string):boolean {
-            var project = input instanceof ProjectReflection ? input : this.convert(input);
+            var project = input instanceof models.ProjectReflection ? input : this.convert(input);
             if (!project) return false;
 
             out = Path.resolve(out);

gruntfile.js

@@ -23,12 +23,12 @@ module td.converter
         /**
          * The project that is currently processed.
          */
-        project:ProjectReflection;
+        project:models.ProjectReflection;
 
         /**
          * The scope or parent reflection that is currently processed.
          */
-        scope:Reflection;
+        scope:models.Reflection;
 
         /**
          * Is the current source file marked as being external?
@@ -43,12 +43,12 @@ module td.converter
         /**
          * The currently set type parameters.
          */
-        typeParameters:ts.Map<Type>;
+        typeParameters:ts.Map<models.Type>;
 
         /**
          * The currently set type arguments.
          */
-        typeArguments:Type[];
+        typeArguments:models.Type[];
 
         /**
          * Is the converter in inheritance mode?
@@ -89,7 +89,7 @@ module td.converter
             this.fileNames = fileNames;
             this.checker = checker;
 
-            var project = new ProjectReflection(this.getOptions().name);
+            var project = new models.ProjectReflection(this.getOptions().name);
             this.project = project;
             this.scope = project;
 
@@ -153,7 +153,7 @@ module td.converter
          * @param node  The node the given reflection was resolved from.
          * @param symbol  The symbol the given reflection was resolved from.
          */
-        registerReflection(reflection:Reflection, node:ts.Node, symbol?:ts.Symbol) {
+        registerReflection(reflection:models.Reflection, node:ts.Node, symbol?:ts.Symbol) {
             this.project.reflections[reflection.id] = reflection;
 
             var id = this.getSymbolID(symbol ? symbol : node.symbol);
@@ -172,7 +172,7 @@ module td.converter
          * @param reflection  The triggering reflection.
          * @param node  The triggering TypeScript node if available.
          */
-        trigger(name:string, reflection:Reflection, node?:ts.Node) {
+        trigger(name:string, reflection:models.Reflection, node?:ts.Node) {
             this.converter.dispatch(name, this, reflection, node);
         }
 
@@ -218,27 +218,27 @@ module td.converter
         /**
          * @param callback  The callback function that should be executed with the changed context.
          */
-        public withScope(scope:Reflection, callback:Function);
+        public withScope(scope:models.Reflection, callback:Function);
 
         /**
          * @param parameters  An array of type parameters that should be set on the context while the callback is invoked.
          * @param callback  The callback function that should be executed with the changed context.
          */
-        public withScope(scope:Reflection, parameters:ts.NodeArray<ts.TypeParameterDeclaration>, callback:Function);
+        public withScope(scope:models.Reflection, parameters:ts.NodeArray<ts.TypeParameterDeclaration>, callback:Function);
 
         /**
          * @param parameters  An array of type parameters that should be set on the context while the callback is invoked.
          * @param preserve  Should the currently set type parameters of the context be preserved?
          * @param callback  The callback function that should be executed with the changed context.
          */
-        public withScope(scope:Reflection, parameters:ts.NodeArray<ts.TypeParameterDeclaration>, preserve:boolean, callback:Function);
+        public withScope(scope:models.Reflection, parameters:ts.NodeArray<ts.TypeParameterDeclaration>, preserve:boolean, callback:Function);
 
         /**
          * Run the given callback with the scope of the context set to the given reflection.
          *
          * @param scope  The reflection that should be set as the scope of the context while the callback is invoked.
          */
-        public withScope(scope:Reflection, ...args) {
+        public withScope(scope:models.Reflection, ...args) {
             if (!scope || !args.length) return;
             var callback = args.pop();
             var parameters = args.shift();
@@ -266,7 +266,7 @@ module td.converter
          * @param typeArguments  The type arguments that apply while inheriting the given node.
          * @return The resulting reflection / the current scope.
          */
-        inherit(baseNode:ts.Node, typeArguments?:ts.NodeArray<ts.TypeNode>):Reflection {
+        inherit(baseNode:ts.Node, typeArguments?:ts.NodeArray<ts.TypeNode>):models.Reflection {
             var wasInherit = this.isInherit;
             var oldInherited = this.inherited;
             var oldInheritParent = this.inheritParent;
@@ -275,8 +275,8 @@ module td.converter
             this.inheritParent = baseNode;
             this.inherited = [];
 
-            var target = <ContainerReflection>this.scope;
-            if (!(target instanceof ContainerReflection)) {
+            var target = <models.ContainerReflection>this.scope;
+            if (!(target instanceof models.ContainerReflection)) {
                 throw new Error('Expected container reflection');
             }
 
@@ -309,8 +309,8 @@ module td.converter
          * @param preserve  Should the currently set type parameters of the context be preserved?
          * @returns The resulting type mapping.
          */
-        private extractTypeParameters(parameters:ts.NodeArray<ts.TypeParameterDeclaration>, preserve?:boolean):ts.Map<Type> {
-            var typeParameters:ts.Map<Type> = {};
+        private extractTypeParameters(parameters:ts.NodeArray<ts.TypeParameterDeclaration>, preserve?:boolean):ts.Map<models.Type> {
+            var typeParameters:ts.Map<models.Type> = {};
 
             if (preserve) {
                 for (var key in this.typeParameters) {

src/td/Application.ts

@@ -46,7 +46,7 @@ module td.converter
         /**
          * The resulting project reflection.
          */
-        project:ProjectReflection;
+        project:models.ProjectReflection;
     }
 
 
@@ -84,7 +84,7 @@ module td.converter
          * @param reflection  The reflection that is currently processed.
          * @param node  The node that is currently processed if available.
          */
-        (context:Context, reflection:Reflection, node?:ts.Node):void;
+        (context:Context, reflection:models.Reflection, node?:ts.Node):void;
     }
 
 
@@ -99,7 +99,7 @@ module td.converter
          * @param context  The context object describing the current state the converter is in.
          * @param reflection  The reflection that is currently resolved.
          */
-        (context:Context, reflection:Reflection):void;
+        (context:Context, reflection:models.Reflection):void;
     }
 
 
@@ -316,7 +316,7 @@ module td.converter
          * @param context  The context object describing the current state the converter is in.
          * @returns The final project reflection.
          */
-        private resolve(context:Context):ProjectReflection {
+        private resolve(context:Context):models.ProjectReflection {
             this.dispatch(Converter.EVENT_RESOLVE_BEGIN, context);
             var project = context.project;