No subprocess (#112)

* Linter now directly imports htmlhint instead of running it as a
subprocess.
lintOnFly can be enabled as a result.
No need for executable path config is there's no executable.

* Froze the htmlhint dependency version.
We are depending on an internal API. Incompatibilities could be introduced at any time.

Author: download13

lib/index.js

@@ -1,8 +1,5 @@
 'use babel';
 
-import * as path from 'path';
-import { execNode, find, rangeFromLineNumber } from 'atom-linter';
-
 const GRAMMAR_SCOPES = [
   'text.html.angular',
   'text.html.basic',
@@ -14,65 +11,58 @@ const GRAMMAR_SCOPES = [
   'text.html.ruby'
 ];
 
-export const config = {
-  executablePath: {
-    title: 'Executable Path',
-    description: 'HTMLHint Node Script Path',
-    type: 'string',
-    default: path.join(__dirname, '..', 'node_modules', 'htmlhint', 'bin', 'htmlhint')
-  }
-};
-
-let executablePath = '';
-
 export function activate() {
   require('atom-package-deps').install('linter-htmlhint');
+}
 
-  executablePath = atom.config.get('linter-htmlhint.executablePath');
+function getConfig(filePath) {
+  const fs = require('fs');
+  const path = require('path');
+  const readFile = require('tiny-promisify')(fs.readFile);
+  const { findAsync } = require('atom-linter');
 
-  atom.config.observe('linter-htmlhint.executablePath', newValue => {
-    executablePath = newValue;
-  });
+  return findAsync(path.dirname(filePath), '.htmlhintrc')
+    .then(configPath => {
+      if (configPath) {
+        return readFile(configPath, 'utf8');
+      }
+      return null;
+    })
+    .then(conf => {
+      if (conf) {
+        return JSON.parse(require('strip-json-comments')(conf));
+      }
+      return null;
+    });
 }
 
 export function provideLinter() {
   return {
     name: 'htmlhint',
     grammarScopes: GRAMMAR_SCOPES,
     scope: 'file',
-    lintOnFly: false,
+    lintOnFly: true,
     lint: editor => {
+      const { HTMLHint } = require('htmlhint');
       const text = editor.getText();
       const filePath = editor.getPath();
 
       if (!text) {
         return Promise.resolve([]);
       }
 
-      const parameters = [filePath, '--format', 'json'];
-      const htmlhintrc = find(path.dirname(filePath), '.htmlhintrc');
-
-      if (htmlhintrc) {
-        parameters.push('-c');
-        parameters.push(htmlhintrc);
-      }
-
-      return execNode(executablePath, parameters, {}).then(output => {
-        const results = JSON.parse(output);
-
-        if (!results.length) {
-          return [];
-        }
-
-        const messages = results[0].messages;
+      return getConfig(filePath)
+        .then(ruleset => HTMLHint.verify(text, ruleset || undefined))
+        .then(messages => {
+          const { rangeFromLineNumber } = require('atom-linter');
 
-        return messages.map(message => ({
-          range: rangeFromLineNumber(editor, message.line - 1, message.col - 1),
-          type: message.type,
-          text: message.message,
-          filePath
-        }));
-      });
+          return messages.map(message => ({
+            range: rangeFromLineNumber(editor, message.line - 1, message.col - 1),
+            type: message.type,
+            text: message.message,
+            filePath
+          }));
+        });
     }
   };
 }

package.json

@@ -28,7 +28,9 @@
   "dependencies": {
     "atom-linter": "^4.6.1",
     "atom-package-deps": "^4.0.1",
-    "htmlhint": "~0.9.12"
+    "htmlhint": "0.9.12",
+    "strip-json-comments": "^2.0.1",
+    "tiny-promisify": "^0.1.1"
   },
   "devDependencies": {
     "eslint": "^2.9.0",