feat(ast) a good bunch going, found a way to represent all useful bits of information

Author: basarat

dist/main/atom/views/astView.js

@@ -78,7 +78,7 @@ function runCode(rootNode, mainContent) {
             .attr("dy", 3.5)
             .attr("dx", 5.5)
             .text(function (d) {
-            return 'Kind: ' + d.kind;
+            return d.kind;
         });
         nodeEnter.transition()
             .duration(duration)

dist/main/lang/modules/astToText.js

@@ -5,7 +5,6 @@
 // Inspired by `ts.forEachChild`:
 // https://github.com/Microsoft/TypeScript/blob/65cbd91667acf890f21a3527b3647c7bc994ca32/src/compiler/parser.ts#L43-L320
 var ts = require("typescript");
-var tsconfig_1 = require("../../tsconfig/tsconfig");
 function astToText(srcFile) {
     //// A useful function for debugging
     // aggregate(srcFile, 0);
@@ -15,11 +14,7 @@ function astToText(srcFile) {
     // }
     var nodeIndex = 0;
     function nodeToNodeDisplay(node, depth) {
-        if (node.parent) {
-            delete node.parent;
-        }
         var kind = syntaxKindToString(node.kind);
-        var details = keyDetails(node, kind);
         var children = [];
         ts.forEachChild(node, function (cNode) {
             var child = nodeToNodeDisplay(cNode, depth + 1);
@@ -28,10 +23,11 @@ function astToText(srcFile) {
         var ret = {
             kind: kind,
             children: children,
+            pos: node.pos,
+            end: node.end,
             depth: depth,
             nodeIndex: nodeIndex,
-            details: details,
-            rawJson: tsconfig_1.prettyJSON(node)
+            rawJson: prettyJSONNoParent(node)
         };
         nodeIndex++;
         return ret;
@@ -40,20 +36,23 @@ function astToText(srcFile) {
     return root;
 }
 exports.default = astToText;
-function keyDetails(node, kind) {
-    var n = node;
-    var details = undefined;
-    if (node.kind == 227) {
-        details = { fileName: node.fileName };
-    }
-    else if (n.name && n.name.text) {
-        details = { 'name.text: ': (n.name.text) };
-    }
-    return details;
-}
 function syntaxKindToString(syntaxKind) {
     return ts.SyntaxKind[syntaxKind];
 }
-function clearParent(obj) {
-    return obj;
+function prettyJSONNoParent(object) {
+    var cache = [];
+    var value = JSON.stringify(object, function (key, value) {
+        if (key == 'parent') {
+            return;
+        }
+        if (typeof value === 'object' && value !== null) {
+            if (cache.indexOf(value) !== -1) {
+                return;
+            }
+            cache.push(value);
+        }
+        return value;
+    }, 4);
+    cache = null;
+    return value;
 }

lib/globals.ts

@@ -136,6 +136,9 @@ interface NodeDisplay {
     kind: string;
     children: NodeDisplay[];
 
+    pos: number;
+    end: number;
+
     /** Represents how many parents it has */
     depth: number;
     /** If we had a flat structure this is where this item would belong */
@@ -144,6 +147,8 @@ interface NodeDisplay {
     /** Key Details I understand */
     details?: any;
 
-    /** Best attempt serialization of original node */
+    /** Best attempt serialization of original node
+    * I also remove `parent`
+    */
     rawJson: any;
 }

lib/main/atom/views/astView.ts

@@ -103,7 +103,7 @@ function runCode(rootNode:NodeDisplay, mainContent:HTMLElement){
           .attr("dy", 3.5)
           .attr("dx", 5.5)
           .text(function(d:NodeDisplay) {
-              return 'Kind: ' + d.kind;
+              return d.kind;
           });
 
       // Transition nodes to their new position.

lib/main/lang/modules/astToText.ts

@@ -8,10 +8,9 @@
 
 import * as ts from "typescript";
 import {SyntaxKind, Node} from "typescript";
-import {prettyJSON} from "../../tsconfig/tsconfig";
 
-/** Important notes:
-  *     I delete `.parent`. As its noisy :)
+/**
+  * Important notes:
   */
 export default function astToText(srcFile: ts.SourceFile) {
 
@@ -24,12 +23,8 @@ export default function astToText(srcFile: ts.SourceFile) {
 
     var nodeIndex = 0;
     function nodeToNodeDisplay(node: ts.Node, depth: number): NodeDisplay {
-        if (node.parent) {
-            delete node.parent;
-        }
 
         var kind = syntaxKindToString(node.kind);
-        var details = keyDetails(node, kind);
 
         var children = [];
         ts.forEachChild(node, (cNode) => {
@@ -40,10 +35,11 @@ export default function astToText(srcFile: ts.SourceFile) {
         var ret: NodeDisplay = {
             kind,
             children,
+            pos: node.pos,
+            end: node.end,
             depth,
             nodeIndex,
-            details,
-            rawJson: prettyJSON(node)
+            rawJson: prettyJSONNoParent(node)
         };
 
         // each time we get called index is incremented
@@ -56,29 +52,34 @@ export default function astToText(srcFile: ts.SourceFile) {
     return root;
 }
 
-
-function keyDetails(node: Node, kind: string): any {
-    let n: any = node;
-    var details = undefined;
-
-    if (node.kind == SyntaxKind.SourceFile) {
-        details = { fileName: (<ts.SourceFile>node).fileName };
-    }
-    else if (n.name && n.name.text) {
-        details = { 'name.text: ': (n.name.text) };
-    }
-
-    return details;
-}
-
 function syntaxKindToString(syntaxKind: ts.SyntaxKind): string {
     return (<any>ts).SyntaxKind[syntaxKind];
 }
 
-function clearParent<T>(obj: T): T {
-    return obj;
-}
 
+function prettyJSONNoParent(object: any): string {
+    var cache = [];
+    var value = JSON.stringify(object,
+        // fixup circular reference
+        function(key, value) {
+            if (key == 'parent'){
+                return;
+            }
+            if (typeof value === 'object' && value !== null) {
+                if (cache.indexOf(value) !== -1) {
+                    // Circular reference found, discard key
+                    return;
+                }
+                // Store value in our collection
+                cache.push(value);
+            }
+            return value;
+        },
+    // indent 4 spaces
+        4);
+    cache = null;
+    return value;
+}
 
 // import {Node,SyntaxKind,visitNode} from "typescript";
 //