Refactoring debts

.gitignore

@@ -1,7 +1,6 @@
 #Compiled files
 dist
 *.js
-!*.spec.js
 
 #IDE
 .vscode

README.md

@@ -7,7 +7,7 @@ Will convert a Typescript file to a PlantUML file. Following all inheritances.
 
 ```
 npm install --global tplant
-tplant --input sample/Classes/Greeter.ts --output sample/Classes/Greeter.puml
+tplant --input test/Playground/Classes/Greeter.ts --output test/Playground/Classes/Greeter.puml
 ```
 
 ## Options

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tplant",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "Typescript to PlantUML",
   "keywords": [
     "Class Diagram",
@@ -24,8 +24,8 @@
   "files": [
     "dist"
   ],
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/tplant.js",
+  "types": "dist/tplant.d.ts",
   "bin": {
     "tplant": "dist/index.js"
   },
@@ -36,7 +36,7 @@
     "lint:fix": "tslint -p . --fix",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
-    "test": "npm run build && mocha --timeout 0"
+    "test": "jest"
   },
   "dependencies": {
     "commander": "^2.20.0",
@@ -45,14 +45,20 @@
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
+    "@types/jest": "^24.0.13",
     "@types/node": "^12.0.0",
-    "mocha": "^6.1.4",
+    "jest": "^24.8.0",
     "pre-commit": "^1.2.2",
+    "ts-jest": "^24.0.2",
     "tslint": "^5.16.0",
     "tslint-microsoft-contrib": "^6.1.1"
   },
   "pre-commit": [
     "lint",
     "test"
-  ]
+  ],
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node"
+  }
 }

src/components/Class.ts → src/Components/Class.ts

@@ -1,25 +1,25 @@
-
 import * as os from 'os';
-import { ComponentKind } from './ComponentKind';
-import { IComponentComposite } from './IComponentComposite';
-import { Interface } from './Interface';
-import { Method } from './Method';
-import { Property } from './Property';
-import { TypeParameter } from './TypeParameter';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
 
 /**
  * Represents the metadata for a class within a typescript file.
  */
 export class Class implements IComponentComposite {
-    public componentKind: ComponentKind = ComponentKind.CLASS;
-    public name: string = '';
+    public readonly componentKind: ComponentKind = ComponentKind.CLASS;
+    public readonly name: string;
     public isAbstract: boolean = false;
     public isStatic: boolean = false;
-    public constructorMethods: Method[] = [];
-    public members: (Method | Property)[] = [];
-    public extendsClass: string = '';
+    public constructorMethods: IComponentComposite[] = [];
+    public members: IComponentComposite[] = [];
+    public extendsClass: string | undefined;
     public implementsInterfaces: string[] = [];
-    public typeParameters: TypeParameter[] = [];
+    public typeParameters: IComponentComposite[] = [];
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
     public toPUML(): string {
         const result: string[] = [];
         const firstLine: string[] = [];
@@ -30,22 +30,26 @@ export class Class implements IComponentComposite {
         if (this.typeParameters.length > 0) {
             firstLine.push('<');
             firstLine.push(this.typeParameters
-                                    .map((typeParameter: TypeParameter): string => typeParameter.toPUML())
-                                    .join(', '));
+                .map((typeParameter: IComponentComposite): string => typeParameter.toPUML())
+                .join(', '));
             firstLine.push('>');
         }
-        if (this.extendsClass !== '') {
+        if (this.extendsClass !== undefined) {
             firstLine.push(` extends ${this.extendsClass}`);
         }
         if (this.implementsInterfaces.length > 0) {
             firstLine.push(` implements ${this.implementsInterfaces.join(', ')}`);
         }
-        firstLine.push(' {');
+        if (this.members.length > 0) {
+            firstLine.push(' {');
+        }
         result.push(firstLine.join(''));
         this.members.forEach((member: IComponentComposite): void => {
             result.push(`    ${member.toPUML()}`);
         });
-        result.push('}');
+        if (this.members.length > 0) {
+            result.push('}');
+        }
 
         return result.join(os.EOL);
     }

src/Components/Enum.ts

@@ -0,0 +1,33 @@
+import * as os from 'os';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+
+/**
+ * Represents the metadata for an Enum within a typescript file.
+ */
+export class Enum implements IComponentComposite {
+    public readonly componentKind: ComponentKind = ComponentKind.ENUM;
+    public readonly name: string;
+    public values: IComponentComposite[] = [];
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        const result: string[] = [];
+        let declaration: string = `enum ${this.name}`;
+        if (this.values.length > 0) {
+            declaration += ' {';
+        }
+        result.push(declaration);
+        this.values.forEach((enumValue: IComponentComposite): void => {
+            result.push(`    ${enumValue.toPUML()}`);
+        });
+        if (this.values.length > 0) {
+            result.push('}');
+        }
+
+        return result.join(os.EOL);
+    }
+}

src/Components/EnumValue.ts

@@ -0,0 +1,19 @@
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+
+/**
+ * Represents the metadata for the value or member of an enum within typescript
+ */
+export class EnumValue implements IComponentComposite {
+    public readonly componentKind: ComponentKind = ComponentKind.PROPERTY;
+    public readonly name: string;
+    public value: string | undefined;
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        return this.name;
+    }
+}

src/components/File.ts → src/Components/File.ts

@@ -1,19 +1,15 @@
-
 import * as os from 'os';
-import { Class } from './Class';
-import { ComponentKind } from './ComponentKind';
-import { Enum } from './Enum';
-import { IComponentComposite } from './IComponentComposite';
-import { Interface } from './Interface';
-import { Namespace } from './Namespace';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
 
 /**
  * Represents the metadata for a file containing typescript
  */
 export class File implements IComponentComposite {
-    public componentKind: ComponentKind = ComponentKind.FILE;
-    public name: string = '';
+    public readonly componentKind: ComponentKind = ComponentKind.FILE;
+    public readonly name: string = '';
     public parts: IComponentComposite[] = [];
+
     public toPUML(): string {
         const result: string[] = [];
         this.parts.forEach((part: IComponentComposite): void => {

src/Components/Interface.ts

@@ -0,0 +1,46 @@
+import * as os from 'os';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+
+/**
+ * Represents the metadata for an interface within typescript
+ */
+export class Interface implements IComponentComposite {
+    public readonly componentKind: ComponentKind = ComponentKind.INTERFACE;
+    public readonly name: string;
+    public members: IComponentComposite[] = [];
+    public extendsInterface: string[] = [];
+    public typeParameters: IComponentComposite[] = [];
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        const result: string[] = [];
+        const firstLine: string[] = [];
+        firstLine.push(`interface ${this.name}`);
+        if (this.typeParameters.length > 0) {
+            firstLine.push('<');
+            firstLine.push(this.typeParameters
+                .map((typeParameter: IComponentComposite): string => typeParameter.toPUML())
+                .join(', '));
+            firstLine.push('>');
+        }
+        if (this.extendsInterface.length > 0) {
+            firstLine.push(` extends ${this.extendsInterface.join(', ')}`);
+        }
+        if (this.members.length > 0) {
+            firstLine.push(' {');
+        }
+        result.push(firstLine.join(''));
+        this.members.forEach((member: IComponentComposite): void => {
+            result.push(`    ${member.toPUML()}`);
+        });
+        if (this.members.length > 0) {
+            result.push('}');
+        }
+
+        return result.join(os.EOL);
+    }
+}

src/components/Method.ts → src/Components/Method.ts

@@ -1,29 +1,32 @@
-
-import { ComponentKind } from './ComponentKind';
-import { IComponentComposite } from './IComponentComposite';
-import { Modifier } from './Modifier';
-import { Parameter } from './Parameter';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+import { Modifier } from '../Models/Modifier';
 
 /**
  * Represents the metadata for a method within typescript
  */
 export class Method implements IComponentComposite {
-    public componentKind: ComponentKind = ComponentKind.METHOD;
-    public name: string = '';
-    public parameters: Parameter[] = [];
-    public returnType: string = '';
+    public readonly componentKind: ComponentKind = ComponentKind.METHOD;
+    public readonly name: string;
+    public parameters: IComponentComposite[] = [];
+    public returnType: string = 'any';
     public modifier: Modifier = 'public';
     public isAbstract: boolean = false;
     public isOptional: boolean = false;
     public isStatic: boolean = false;
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
     public toPUML(): string {
         let result: string = { public: '+', private: '-', protected: '#' }[this.modifier];
         result += (this.isAbstract ? '{abstract} ' : '');
         result += (this.isStatic ? '{static} ' : '');
         result += `${this.name}(`;
         result += this.parameters
-                    .map((parameter: Parameter): string => parameter.toPUML())
-                    .join(', ');
+            .map((parameter: IComponentComposite): string => parameter.toPUML())
+            .join(', ');
         result += `): ${this.returnType}`;
 
         return result;

src/Components/Namespace.ts

@@ -0,0 +1,37 @@
+import * as os from 'os';
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+
+/**
+ * Represents the metadata for a namespace within typescript
+ */
+export class Namespace implements IComponentComposite {
+    public readonly name: string;
+    public readonly componentKind: ComponentKind = ComponentKind.NAMESPACE;
+    public parts: IComponentComposite[] = [];
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        const result: string[] = [];
+        const declaration: string[] = [];
+        declaration.push(`namespace ${this.name}`);
+        if (this.parts.length > 0) {
+            declaration.push(' {');
+        }
+        result.push(declaration.join(''));
+        this.parts.forEach((part: IComponentComposite): void => {
+            result.push(
+                part.toPUML()
+                    .replace(/^(?!\s*$)/gm, '    ')
+            );
+        });
+        if (this.parts.length > 0) {
+            result.push('}');
+        }
+
+        return result.join(os.EOL);
+    }
+}

src/Components/Parameter.ts

@@ -0,0 +1,21 @@
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+
+/**
+ * Represents the metadata for a parameter within typescript
+ */
+export class Parameter implements IComponentComposite {
+    public readonly componentKind: ComponentKind = ComponentKind.PARAMETER;
+    public readonly name: string;
+    public hasInitializer: boolean = false;
+    public isOptional: boolean = false;
+    public parameterType: string = 'any';
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        return `${this.name}${this.isOptional || this.hasInitializer ? '?' : ''}: ${this.parameterType}`;
+    }
+}

src/Components/Property.ts

@@ -0,0 +1,24 @@
+import { ComponentKind } from '../Models/ComponentKind';
+import { IComponentComposite } from '../Models/IComponentComposite';
+import { Modifier } from '../Models/Modifier';
+
+/**
+ * Represents the metadata for a property within typescript
+ */
+export class Property implements IComponentComposite {
+    public readonly componentKind: ComponentKind = ComponentKind.PROPERTY;
+    public readonly name: string;
+    public modifier: Modifier = 'public';
+    public returnType: string = 'any';
+    public isOptional: boolean = false;
+    public isStatic: boolean = false;
+
+    constructor(name: string) {
+        this.name = name;
+    }
+
+    public toPUML(): string {
+        return `${{ public: '+', private: '-', protected: '#' }[this.modifier]}${(this.isStatic ? '{static} ' : '')
+            }${this.name}${(this.isOptional ? '?' : '')}: ${this.returnType}`;
+    }
+}