Improve output for computed property names

Author: rbuckton

src/lib/converter/factories/declaration.ts

@@ -23,6 +23,8 @@ const nonStaticMergeKinds = [
     ts.SyntaxKind.InterfaceDeclaration
 ];
 
+const builtInSymbolRegExp = /^__@(\w+)$/;
+
 /**
  * Create a declaration reflection from the given TypeScript node.
  *
@@ -48,6 +50,21 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind:
         } else {
             return;
         }
+
+        // rename built-in symbols
+        const match = builtInSymbolRegExp.exec(name);
+        if (match) {
+            name = `[Symbol.${match[1]}]`;
+        } else if (kind & ReflectionKind.ClassMember && name === '__computed') {
+            // rename computed properties
+            const declName = ts.getNameOfDeclaration(node);
+            const symbol = declName && context.checker.getSymbolAtLocation(declName);
+            if (symbol) {
+                name = context.checker.symbolToString(symbol, /*enclosingDeclaration*/ undefined, ts.SymbolFlags.ClassMember);
+            } else if (declName) {
+                name = declName.getText();
+            }
+        }
     }
 
     const modifiers = ts.getCombinedModifierFlags(node);

src/lib/models/reflections/abstract.ts

@@ -62,6 +62,7 @@ export enum ReflectionKind {
     ClassOrInterface = Class | Interface,
     VariableOrProperty = Variable | Property,
     FunctionOrMethod = ReflectionKind.Function | Method,
+    ClassMember = Accessor | Constructor | Method | Property | Event,
     SomeSignature = CallSignature | IndexSignature | ConstructorSignature | GetSignature | SetSignature,
     SomeModule = Module | ExternalModule,
     SomeType = Interface | TypeLiteral | TypeParameter | TypeAlias,