3.0 merge

lib/errors.js

@@ -27,24 +27,21 @@ Errors.prototype = {
     /**
      * Adds style error to the list
      *
-     * @param {String} message
-     * @param {Number|Object} line
-     * @param {Number} [column] optional if line is an object
+     * @param {String | Error} message
+     * @param {cst.types.Element} element
+     * @param {Number} [offset] relative offset
      */
-    add: function(message, line, column) {
-        if (typeof line === 'object') {
-            column = line.column;
-            line = line.line;
+    add: function(message, element, offset) {
+        if (message instanceof Error) {
+            this._addParseError(message);
+            return;
         }
 
-        var errorInfo = {
+        this._addError({
             message: message,
-            line: line,
-            column: column
-        };
-
-        this._validateInput(errorInfo);
-        this._addError(errorInfo);
+            element: element,
+            offset: offset || element.sourceCodeLength
+        });
     },
 
     /**
@@ -61,18 +58,20 @@ Errors.prototype = {
         this._addError(errorInfo);
     },
 
-    _validateInput: function(errorInfo) {
-        var line = errorInfo.line;
-        var column = errorInfo.column;
-
-        // line and column numbers should be explicit
-        assert(typeof line === 'number' && line > 0,
-            'Unable to add an error, `line` should be a number greater than 0 but ' +
-                line + ' given');
-
-        assert(typeof column === 'number' && column >= 0,
-            'Unable to add an error, `column` should be a positive number but ' +
-                column + ' given');
+    /**
+     * Adds parser error to error list.
+     *
+     * @param {Object} errorInfo
+     * @private
+     */
+    _addParseError: function(errorInfo) {
+        this._errorList.push({
+            filename: this._file.getFilename(),
+            rule: 'parseError',
+            message: errorInfo.message,
+            line: errorInfo.loc && errorInfo.loc.line,
+            column: errorInfo.loc && errorInfo.loc.column
+        });
     },
 
     /**
@@ -82,18 +81,19 @@ Errors.prototype = {
      * @private
      */
     _addError: function(errorInfo) {
-        if (!this._file.isEnabledRule(this._currentRule, errorInfo.line)) {
+        if (!this._file.isEnabledRule(this._currentRule, errorInfo.element)) {
             return;
         }
 
-        this._validateInput(errorInfo);
-
+        var position = Errors.getPosition(errorInfo.element);
         this._errorList.push({
             filename: this._file.getFilename(),
             rule: this._currentRule,
             message: this._prepareMessage(errorInfo),
-            line: errorInfo.line,
-            column: errorInfo.column,
+            element: errorInfo.element,
+            line: position.line,
+            column: position.column,
+            offset: errorInfo.offset,
             additional: errorInfo.additional,
             fixed: errorInfo.fixed
         });
@@ -106,8 +106,10 @@ Errors.prototype = {
      * @private
      */
     _prepareMessage: function(errorInfo) {
-        if (this._verbose && this._currentRule) {
-            return this._currentRule + ': ' + errorInfo.message;
+        var rule = errorInfo instanceof Error ? 'parseError' : this._currentRule;
+
+        if (this._verbose && rule) {
+            return rule + ': ' + errorInfo.message;
         }
 
         return errorInfo.message;
@@ -140,6 +142,17 @@ Errors.prototype = {
         return this._errorList.length === 0;
     },
 
+    /**
+     * Returns amount of errors added by the rules.
+     *
+     * @returns {Number}
+     */
+    getValidationErrorCount: function() {
+        return this._errorList.filter(function(error) {
+            return error.rule !== 'parseError' && error.rule !== 'internalError';
+        });
+    },
+
     /**
      * Returns amount of errors added by the rules.
      *
@@ -267,4 +280,36 @@ function renderPointer(column, colorize) {
     return colorize ? chalk.grey(res) : res;
 }
 
+/**
+ * Get position of the element
+ * TODO: 3.0 - need to account for non-zero offset
+ *
+ * @param {Object} [element]
+ * @return {Object}
+ */
+Errors.getPosition = function(element) {
+    if (!element || !element.loc) {
+        return {
+            line: 0,
+            column: 0
+        };
+    }
+
+    var startColumn = element.loc.start.column;
+    var endColumn = element.loc.end.column;
+    var column;
+
+    if (element.sourceCodeLength === 1) {
+        column = startColumn;
+
+    } else {
+        column = startColumn + Math.ceil((endColumn - startColumn) / 2);
+    }
+
+    return {
+        line: element.loc.start.line,
+        column: column
+    };
+};
+
 module.exports = Errors;