feat(prelude): add tokens support

Author: olegskl

package.json

@@ -27,7 +27,7 @@
   "homepage": "https://github.com/esnext-coverage/babel-plugin-transform-esnext-coverage",
   "dependencies": {
     "babel-template": "^6.16.0",
-    "esnext-coverage-analytics": "^0.0.5"
+    "esnext-coverage-analytics": "^0.0.6"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
@@ -37,8 +37,7 @@
     "babel-preset-es2015": "^6.18.0",
     "eslint": "^3.12.2",
     "eslint-config-meetic": "^4.0.0",
-    "esnext-coverage": "^0.0.5",
-    "esnext-coverage-format-html": "^0.0.6",
+    "esnext-coverage": "^0.0.7",
     "tape": "^4.6.3"
   },
   "esnextcoverage": {

src/marker.js

@@ -37,6 +37,6 @@ export function createMarker(state, {loc, tags}, node) {
     args.push(node);
   }
   const marker = types.callExpression(variable, args);
-  locations.push(codec.encode({loc, tags, count: 0}));
+  locations.push(codec.encodeLocation({loc, tags, count: 0}));
   return markAsInstrumented(marker);
 }

src/prelude.js

@@ -2,21 +2,35 @@ import {readFileSync} from 'fs';
 import path from 'path';
 import {types} from 'babel-core';
 import template from 'babel-template';
+import {codec} from 'esnext-coverage-analytics';
 import {getCoverageMeta} from './meta';
 
 const preludeFilePath = path.resolve(__dirname, 'templates/prelude-template.js');
 const render = template(readFileSync(preludeFilePath, 'utf8'));
 
 export const defaultNamespace = '__coverage__';
 
+function normalizeTokenType(tokenType) {
+  if (tokenType === 'CommentBlock' || tokenType === 'CommentLine') { return 'comment'; }
+  if (tokenType.keyword) { return 'keyword'; }
+  if (tokenType.label) { return tokenType.label; }
+  return 'other';
+}
+
+function simplifyToken({loc, type}) {
+  return {loc, type: normalizeTokenType(type)};
+}
+
 export default function prelude(state) {
   const {variable, locations} = getCoverageMeta(state);
   const name = state.file.opts.filenameRelative.replace(`${process.cwd()}${path.sep}`, '');
   const namespace = state.opts && state.opts.global || defaultNamespace;
+  const tokens = state.file.ast.tokens.map(simplifyToken).map(codec.encodeToken);
   return render({
     VARIABLE: variable,
     NAMESPACE: types.stringLiteral(namespace),
     FILEPATH: types.stringLiteral(name),
+    TOKENS: types.stringLiteral(JSON.stringify(tokens)),
     LOCATIONS: types.stringLiteral(JSON.stringify(locations))
   });
 }

src/templates/.eslintrc

@@ -2,6 +2,7 @@
   "globals": {
     "NAMESPACE": true,
     "FILEPATH": true,
+    "TOKENS": true,
     "LOCATIONS": true,
     "window": true,
     "global": true

src/templates/prelude-template.js

@@ -1,9 +1,12 @@
 var VARIABLE = (function (context) {
+  var tokens = JSON.parse(TOKENS);
   var locations = JSON.parse(LOCATIONS);
+  var stack = [];
   context[NAMESPACE] = context[NAMESPACE] || {};
-  context[NAMESPACE][FILEPATH] = locations;
+  context[NAMESPACE][FILEPATH] = [locations, tokens, stack];
   return function (id, value) {
     locations[id][0]++;
+    stack.push(id);
     return value;
   };
 })(

test/spec/helpers/run.js

@@ -16,7 +16,7 @@ export default function runFixture(fixtureName) {
       };
       runInNewContext(code, sandbox);
       const fileCoverage = sandbox.global[namespace][relativeFixturePath];
-      return codec.decodeAll(fileCoverage);
+      return codec.decode(fileCoverage).locations;
     })
     .catch(error => console.error(error)); // eslint-disable-line no-console
 }