Merge pull request #91 from SimplrJS/dev

v4.0.0-beta.6

Author: Martynas Žilinskas

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-extractor",
-    "version": "4.0.0-beta.5",
+    "version": "4.0.0-beta.6",
     "description": "TypeScript AST extractor to useful JSON structure.",
     "keywords": [
         "typescript",

src/contracts/definitions/api-class-constructor-dto.ts

@@ -1,11 +1,8 @@
-import { ApiBaseItemDto } from "../api-base-item-dto";
 import { AccessModifier } from "../access-modifier";
-import { ApiItemReference } from "../api-item-reference";
 import { ApiItemKinds } from "../api-item-kinds";
+import { ApiCallableDto } from "../api-callable-dto";
 
-export interface ApiClassConstructorDto extends ApiBaseItemDto {
+export interface ApiClassConstructorDto extends ApiCallableDto {
     ApiKind: ApiItemKinds.ClassConstructor;
-    IsOverloadBase: boolean;
-    Parameters: ApiItemReference[];
     AccessModifier: AccessModifier;
 }

src/definitions/api-class-constructor.ts

@@ -1,26 +1,19 @@
 import * as ts from "typescript";
-import { ApiItem } from "../abstractions/api-item";
 
+import { ApiCallableBase } from "../abstractions/api-callable-base";
 import { ApiHelpers } from "../api-helpers";
 import { ApiClassConstructorDto } from "../contracts/definitions/api-class-constructor-dto";
-import { ApiItemReference } from "../contracts/api-item-reference";
 import { ApiItemKinds } from "../contracts/api-item-kinds";
 import { AccessModifier } from "../contracts/access-modifier";
 
 import { ApiMetadataDto } from "../contracts/api-metadata-dto";
 import { ApiItemLocationDto } from "../contracts/api-item-location-dto";
 
-export class ApiClassConstructor extends ApiItem<ts.ConstructorDeclaration, ApiClassConstructorDto> {
-    private isOverloadBase: boolean;
-    private parameters: ApiItemReference[] = [];
+export class ApiClassConstructor extends ApiCallableBase<ts.ConstructorDeclaration, ApiClassConstructorDto> {
     private accessModifier: AccessModifier;
 
     protected OnGatherData(): void {
-        // Overload
-        this.isOverloadBase = this.TypeChecker.isImplementationOfOverload(this.Declaration) || false;
-
-        // Parameters
-        this.parameters = ApiHelpers.GetItemsIdsFromDeclarations(this.Declaration.parameters, this.Options);
+        super.OnGatherData();
 
         // Modifiers
         this.accessModifier = ApiHelpers.ResolveAccessModifierFromModifiers(this.Declaration.modifiers);
@@ -37,9 +30,10 @@ export class ApiClassConstructor extends ApiItem<ts.ConstructorDeclaration, ApiC
             ParentId: parentId,
             Metadata: metadata,
             Location: location,
-            IsOverloadBase: this.isOverloadBase,
-            Parameters: this.parameters,
+            IsOverloadBase: this.IsOverloadBase,
+            Parameters: this.Parameters,
             AccessModifier: this.accessModifier,
+            TypeParameters: this.TypeParameters,
             _ts: this.GetTsDebugInfo()
         };
     }