handle position nodes

Author: ichiriac

src/node.js

@@ -10,11 +10,11 @@ var comment = require('./comment');
 
 /**
  * Generic node object (inherited by all objects)
- * 
+ *
  * @public @constructor {node}
  * @param {node} parent The parent node
  * @param {array} ast The current AST node
- * 
+ *
  * @property {node} parent Parent node instance
  * @property {relation[]} relations {@link RELATION.md|:link:} List of linked nodes
  * @property {position|null} position {@link POSITION.md|:link:} Current node position
@@ -32,24 +32,8 @@ var node = function(parent, ast) {
   this.relations = [];
 
   // check if contains a position node
-  if (ast[0] === 'position') {
-    this.position = new position(ast);
-    ast = ast[3];
-  }
-  // check if doc block with inner component
-  if (ast[0] === 'doc' && ast.length === 3) {
-    this.doc = comment.create(this, ast);
-    ast = ast[2];
-    if (this.position) {
-      // attach position node to comment
-      this.doc.position = this.position;
-      if (ast[0] === 'position') {
-        this.position = new position(ast);
-        ast = ast[3];
-      } else {
-        delete this.position;
-      }
-    }
+  if (ast.loc) {
+    this.position = new position(ast.loc);
   }
 
   if (this.type !== 'file') {
@@ -223,30 +207,30 @@ node.prototype.export = function() {
 
 /**
  * Use this function to extend a node into a specific object.
- * 
+ *
  * In order to make the cache wording automatically, the class
  * name must be the same as the filename `foo` class into `./foo.js`
- * 
+ *
  * *WARNING* : It you pass a constructor, make sur it's named in order to
  * automatically retrieve it's classname (used by the caching system)
- * 
+ *
  * @public
  * @param {constructor|string} ctor Define the named constructor, or the class name
  * @return {constructor}
- * 
+ *
  * @example Create with a constructor
  * var block = require('./block');
  * var child = block.extends(function className(parent, ast) {
  *   block.apply(this, [parent, ast]);
  *   // customized init code
  * });
  * child.prototype.foo = function() ...
- * 
+ *
  * @example Create with a generic class name
  * var block = require('./block');
  * var child = block.extends('className');
  * child.prototype.foo = function() ...
- * 
+ *
  */
 node.extends = declareExtends(node);
 
@@ -296,4 +280,4 @@ function declareExtends(base) {
 }
 ;
 
-module.exports = node;
+module.exports = node;

src/position.js

@@ -3,21 +3,19 @@
  * @constructor
  */
 var position = function(node) {
-  if (node[0] !== 'position') {
-    throw new Error('Bad node type');
-  }
   this.start = {
-    line: node[1][0],
-    column: node[1][1]
+    line: node.start.line,
+    column: node.start.column
   }
   this.end = {
-    line: node[2][0],
-    column: node[2][1]
+    line: node.end.line,
+    column: node.end.column
   }
   this.offset = {
-    start: node[1][2],
-    end: node[2][2]
+    start: node.start.offset,
+    end: node.end.offset
   };
+  console.log(this);
 };
 
 /**
@@ -36,4 +34,4 @@ position.prototype.hit = function(offset) {
   return offset >= this.offset.start && offset <= this.offset.end;
 }
 
-module.exports = position;
+module.exports = position;

src/repository.js

@@ -106,9 +106,9 @@ var repository = function(directory, options) {
 util.inherits(repository, EventEmitter);
 
 /**
- * Starts to read a file in order to parse it. This event is emited from 
+ * Starts to read a file in order to parse it. This event is emited from
  * parse or refresh methods.
- * 
+ *
  * @event repository#read
  * @type {object}
  * @property {string} name - The filename that will be parsed
@@ -117,24 +117,24 @@ util.inherits(repository, EventEmitter);
 
 /**
  * Cache hit event, file is already updated
- * 
+ *
  * @event repository#cache
  * @type {object}
  * @property {string} name - The filename that was found in cache
  */
 
 /**
  * The specified file is parsed.
- * 
+ *
  * @event repository#parse
  * @type {object}
  * @property {string} name - The filename that will be parsed
  * @property {file} file - The file
  */
 
 /**
- * 
- * 
+ *
+ *
  * @event repository#error
  * @type {object}
  * @property {string} name - The filename that triggered the error
@@ -304,17 +304,20 @@ repository.prototype.parse = function(filename, encoding, stat) {
         fs.readFile(
           path.resolve(self.directory, filename),
           encoding, function(err, data) {
+            var ast;
             if (!err) {
               try {
                 var reader = new parser({
+                  ast: {
+                    withPositions: true
+                  },
                   parser: {
-                    locations: true,
                     extractDoc: true,
                     suppressErrors: true
                   }
                 });
                 data = data.toString(encoding);
-                var ast = reader.parseCode(data);
+                ast = reader.parseCode(data);
               } catch (e) {
                 err = e;
               }