Refactored decorator creation, made decorators case-insensitive

Perryvw · Perryvw · commit 558682813c94 · 2018-11-26T22:55:28.000+01:00
diff --git a/src/Decorator.ts b/src/Decorator.ts
@@ -1,14 +1,30 @@
 export class Decorator {
+
+    public static isValid(decoratorKindString: string): boolean {
+        return this.getDecoratorKind(decoratorKindString) !== undefined;
+    }
+
+    public static getDecoratorKind(decoratorKindString: string): DecoratorKind {
+        switch (decoratorKindString.toLowerCase()) {
+            case "extension": return DecoratorKind.Extension;
+            case "metaextension": return DecoratorKind.MetaExtension;
+            case "customconstructor": return DecoratorKind.CustomConstructor;
+            case "compilemembersonly": return DecoratorKind.CompileMembersOnly;
+            case "pureabstract": return DecoratorKind.PureAbstract;
+            case "phantom": return DecoratorKind.Phantom;
+            case "tuplereturn": return DecoratorKind.TupleReturn;
+            case "noclassor": return DecoratorKind.NoClassOr;
+        }
+
+        return undefined;
+    }
+
     public kind: DecoratorKind;
     public args: string[];
 
-    constructor(raw: string) {
-        let nameEnd = raw.indexOf(" ");
-        if (nameEnd === -1) {
-            nameEnd = raw.length;
-        }
-        this.kind = DecoratorKind[raw.substring(0, nameEnd)];
-        this.args = raw.split(" ").slice(1);
+    constructor(name: string, args: string[]) {
+        this.kind = Decorator.getDecoratorKind(name);
+        this.args = args;
     }
 }
 
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -117,8 +117,9 @@ export class TSHelper {
             const decMap = new Map<DecoratorKind, Decorator>();
 
             decorators.forEach(decStr => {
-                const dec = new Decorator(decStr.substr(1));
-                if (dec.kind !== undefined) {
+                const [decoratorName, ...decoratorArguments] = decStr.split(" ");
+                if (Decorator.isValid(decoratorName.substr(1))) {
+                    const dec = new Decorator(decoratorName.substr(1), decoratorArguments);
                     decMap.set(dec.kind, dec);
                     console.warn(`[Deprecated] Decorators with ! are being deprecated, `
                         + `use @${decStr.substr(1)} instead`);
@@ -128,8 +129,8 @@ export class TSHelper {
             });
 
             type.symbol.getJsDocTags().forEach(tag => {
-                const dec = new Decorator(tag.name);
-                if (dec.kind !== undefined) {
+                if (Decorator.isValid(tag.name)) {
+                    const dec = new Decorator(tag.name, tag.text.split(" "));
                     decMap.set(dec.kind, dec);
                 }
             });
diff --git a/test/runner.ts b/test/runner.ts
@@ -1,5 +1,4 @@
 import { TestRunner, TestSet } from "alsatian";
-import { TapBark } from "tap-bark";
 
 import * as fs from "fs";
 import * as path from "path";
@@ -21,9 +20,6 @@ fs.copyFileSync(
 
 // setup the output
 testRunner.outputStream
-          // this will use alsatian's default output if you remove this
-          // you'll get TAP or you can add your favourite TAP reporter in it's place
-          .pipe(TapBark.create().getPipeable())
           // pipe to the console
           .pipe(process.stdout);
 
