cleanup; remove need to transpile main module

Author: Andrew Schmadel

README.md

@@ -21,28 +21,23 @@ far from Esprima to make that goal realistic.  (I would love to be proven wrong
 
 That being said, this is my short-term todo list:
 
-* Support the majority of invocations/annotations currently performed by ng-annotate
-* Split up ng-annotate's test suite to be more granular and tolerant of some of babel's other transforms.
-* Actually pass those tests.
+✓ Support the majority of invocations/annotations currently performed by ng-annotate
+✓ Split up ng-annotate's test suite to be more granular and tolerant of some of babel's other transforms.
+✓ Actually pass those tests.
+* Pass tests in conjunction with the ES2015 preset.
 * Cleanup.  Remove vestigial functionality from the upstream project.
 * Support a (very) limited set of ES6-friendly annotation patterns.  
 * Publish to npm, make a release, etc.
 
 
 ## Don't Say I Didn't Warn You
 
-To test this mess of an experiment, compile the ES6 sources into something that Node can run:
-
-```
-babel babel-ng-annotate.js -o babel-ng-annotate-harmony.js
-```
-
-Create a .babelrc file for your sources 
+To test this mess of an experiment, create a .babelrc file for your sources 
 
 ```json
 {
   "presets": ["es2015"],
-  "plugins": ["path/to/babel-ng-annotate-harmony"]
+  "plugins": ["path/to/babel-ng-annotate"]
 }
 
 ```
@@ -53,6 +48,11 @@ And try it out:
 babel original.js
 ```
 
+### To run tests:
+
+```
+node tests/tests.js
+```
 
 
 ## License

babel-ng-annotate.js

@@ -1,11 +1,18 @@
-import { match, addModuleContextDependentSuspect, addModuleContextIndependentSuspect,
-judgeSuspects, matchDirectiveReturnObject,
-matchProviderGet } from './ng-annotate-main.js'
+'use strict';
 
-import ngInject from './nginject';
-import is from 'simple-is';
+var ngAnnotate = require('./ng-annotate-main');
+const ngInject = require('./nginject');
+const is = require('simple-is');
 
-export default function({ types: t }) {
+const match = ngAnnotate.match;
+const addModuleContextDependentSuspect = ngAnnotate.addModuleContextDependentSuspect;
+const addModuleContextIndependentSuspect = ngAnnotate.addModuleContextIndependentSuspect;
+const judgeSuspects = ngAnnotate.judgeSuspects;
+const matchDirectiveReturnObject = ngAnnotate.matchDirectiveReturnObject;
+const matchProviderGet = ngAnnotate.matchProviderGet;
+
+
+module.exports = function() {
 
     var options = {};
 
@@ -104,7 +111,7 @@ export default function({ types: t }) {
             return file.file.code.slice(node.start, node.end);
           };
         },
-        exit(path) {
+        exit() {
           judgeSuspects(ctx);
         }
       }

ng-annotate-main.js

@@ -475,6 +475,7 @@ function insertArray(ctx, path) {
 
 }
 
+// TODO: Is this necessary?
 function renameProviderDeclarationSite(ctx, literalNode, fragments) {
     fragments.push({
         start: literalNode.range[0] + 1,

package.json

@@ -25,7 +25,7 @@
   "devDependencies": {
     "babel": "^6.5.1",
     "babel-core": "^6.5.1",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015": "^6.5.0",
     "chalk": "^1.1.1",
     "coffee-script": "~1.10.0",
     "defs": "~1.1.1",

tests/.babelrc

@@ -1,4 +1,3 @@
 {
-  "presets": ["es2015"],
-  "plugins": ["../babel-ng-annotate-harmony"]
+  "plugins": ["../babel-ng-annotate"]
 }

tests/tests.js

@@ -40,8 +40,8 @@ function runTests(tests){
 }
 
 function runTest(test) {
-  var out = babel.transform(fnBody(test.input),  { plugins: "../babel-ng-annotate-harmony" });
-  var expected = babel.transform(fnBody(test.expected));
+  var out = babel.transform(fnBody(test.input),  { plugins: "../babel-ng-annotate", presets: ["../es2015-modified"] });
+  var expected = babel.transform(fnBody(test.expected), { plugins: [], presets: ["../es2015-modified"] });
 
   if(out.code.trim() != expected.code.trim()){
     console.warn("  " + test.name + ": " + chalk.red.bold("FAILED."));
@@ -83,8 +83,8 @@ function printDiff(expected, actual){
   }).reduce((memo, val) => memo + val, "");
   console.warn(msg);
 
-  console.warn(chalk.bold("GOT:") + "\n" + actual);
-  console.warn(chalk.bold("WANTED:") + "\n" + expected + '\n');
+  // console.warn(chalk.bold("GOT:") + "\n" + actual);
+  // console.warn(chalk.bold("WANTED:") + "\n" + expected + '\n');
 }
 
 suites.forEach(runSuite);