Merge pull request #51 from Turbo87/node-4

Remove Babel transpilation step

Author: rwjblue

.babelrc

@@ -1,6 +1,5 @@
 {
   "devDependencies": {
-    "babel-cli": "^6.22.2",
     "babel-core": "^6.22.1",
     "babel-preset-env": "^1.2.2",
     "babel-preset-latest": "^6.24.0",
@@ -12,19 +11,17 @@
   "name": "babel-plugin-debug-macros",
   "version": "0.1.11",
   "description": "Debug macros and feature flag stripping",
-  "main": "dist/index.js",
+  "main": "src/index.js",
   "files": [
-    "dist/",
-    "!dist/tests"
+    "src/",
+    "!src/tests"
   ],
   "repository": {
     "type": "git",
     "url": "https://github.com/chadhietala/babel-debug-macros"
   },
   "scripts": {
-    "build": "babel src --out-dir dist",
-    "prepublish": "babel src --out-dir dist",
-    "test": "babel src --out-dir dist && mocha dist/tests/**-test.js"
+    "test": "mocha src/tests/**-test.js"
   },
   "keywords": [
     "babel",

package.json

@@ -1,10 +1,11 @@
-import Macros from './lib/utils/macros';
-import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { normalizeOptions } from './lib/utils/normalize-options';
+'use strict';
+
+const Macros = require('./lib/utils/macros');
+const normalizeOptions = require('./lib/utils/normalize-options').normalizeOptions;
 
 function macros(babel) {
-  const { types: t } = babel;
+  const t = babel.types;
+
   let macroBuilder;
   let options;
 
@@ -23,11 +24,9 @@ function macros(babel) {
             if (item.isImportDeclaration()) {
               let importPath = item.node.source.value;
 
-              let {
-                featureSources,
-                debugTools: { debugToolsImport },
-                envFlags: { envFlagsImport, flags }
-              } = options;
+              let featureSources = options.featureSources;
+              let debugToolsImport = options.debugTools.debugToolsImport;
+              let envFlagsImport = options.envFlags.envFlagsImport;
 
               let isFeaturesImport = featureSources.indexOf(importPath) > -1;
 
@@ -57,4 +56,4 @@ macros.baseDir = function() {
   return dirname(__dirname);
 }
 
-export default macros;
+module.exports = macros;

src/index.js

@@ -1,4 +1,6 @@
-export default class Builder {
+'use strict';
+
+module.exports = class Builder {
   constructor(t, options) {
     this.t = t;
     this.module = options.module;
@@ -82,21 +84,20 @@ export default class Builder {
   _createMacroExpression(path, _options) {
     let options = _options || {};
 
-    let { t, module, global } = this;
+    let t = this.t;
     let expression = path.node.expression;
-    let { callee, arguments: args } = expression;
-    let callExpression;
+    let callee = expression.callee;
+    let args = expression.arguments;
 
     if (options.validate) {
       options.validate(expression, args);
     }
 
-    if (module || global) {
-      if (global) {
-        callExpression = this._createGlobalExternalHelper(callee, args, global);
-      } else {
-        callExpression = expression;
-      }
+    let callExpression;
+    if (this.module) {
+      callExpression = expression;
+    } else if (this.global) {
+      callExpression = this._createGlobalExternalHelper(callee, args, this.global);
     } else if (options.buildConsoleAPI) {
       callExpression = options.buildConsoleAPI(expression, args);
     } else {
@@ -145,13 +146,13 @@ export default class Builder {
       predicate: (expression, args) => args[1],
 
       buildConsoleAPI: (expression, args) => {
-        let [message] = args;
+        let message = args[0];
 
         return this._createConsoleAPI(this.t.identifier('warn'), [message]);
       },
 
       validate: (expression, args) => {
-        let [ , , meta ] = args;
+        let meta = args[2];
 
         if (meta && meta.properties && !meta.properties.some( prop =>  prop.key.name === 'id')) {
           throw new ReferenceError(`deprecate's meta information requires an "id" field.`);
@@ -168,10 +169,12 @@ export default class Builder {
    * Performs the actually expansion of macros
    */
   expandMacros(debugFlag) {
-    let { t } = this;
+    let t = this.t;
     let flag = t.booleanLiteral(debugFlag);
     for (let i = 0; i < this.expressions.length; i++) {
-      let [exp, logicalExp] = this.expressions[i];
+      let expression = this.expressions[i];
+      let exp = expression[0];
+      let logicalExp = expression[1];
       exp.replaceWith(t.parenthesizedExpression(logicalExp(flag)));
     }
   }
@@ -181,17 +184,17 @@ export default class Builder {
   }
 
   _createGlobalExternalHelper(identifier, args, ns) {
-    let { t } = this;
+    let t = this.t;
     return t.callExpression(t.memberExpression(t.identifier(ns), identifier), args);
   }
 
   _createConsoleAPI(identifier, args) {
-    let { t } = this;
+    let t = this.t;
     return t.callExpression(t.memberExpression(t.identifier('console'), identifier), args);
   }
 
   _buildLogicalExpressions(identifiers, callExpression) {
-    let { t } = this;
+    let t = this.t;
 
     return (debugIdentifier) => {
       identifiers.unshift(debugIdentifier);

src/lib/utils/builder.js

@@ -1,10 +1,11 @@
-const DEBUG = 'DEBUG';
+'use strict';
 
-import Builder from './builder';
+const Builder = require('./builder');
 
+const DEBUG = 'DEBUG';
 const SUPPORTED_MACROS = ['assert', 'deprecate', 'warn', 'log'];
 
-export default class Macros {
+module.exports = class Macros {
   constructor(t, options) {
     this.localDebugBindings = [];
     this.envFlagBindings = [];
@@ -31,8 +32,6 @@ export default class Macros {
    */
   expand(path) {
     let debugBinding = path.scope.getBinding(DEBUG);
-    let { builder, envFlags } = this;
-
 
     if (this._hasDebugModule(debugBinding)) {
       debugBinding.path.parentPath.remove();
@@ -41,12 +40,12 @@ export default class Macros {
     this._inlineFeatureFlags(path);
     this._inlineSvelteFlags(path);
     this._inlineEnvFlags(path)
-    this.builder.expandMacros(envFlags.DEBUG);
+    this.builder.expandMacros(this.envFlags.DEBUG);
     this._cleanImports(path);
   }
 
   _inlineFeatureFlags(path) {
-    let { envFlags, builder, featureFlags, featuresMap } = this;
+    let featuresMap = this.featuresMap;
 
     if (this.envFlags.DEBUG) { return; }
     Object.keys(featuresMap).forEach((source) => {
@@ -56,7 +55,7 @@ export default class Macros {
 
         if (binding && flagValue !== null) {
           binding.referencePaths.forEach(referencePath => {
-            referencePath.replaceWith(builder.t.booleanLiteral(flagValue));
+            referencePath.replaceWith(this.builder.t.booleanLiteral(flagValue));
           });
 
           if (binding.path.parentPath.isImportDeclaration()) {
@@ -68,38 +67,42 @@ export default class Macros {
   }
 
   _inlineEnvFlags(path) {
-    let { envFlags, builder } = this;
+    let envFlags = this.envFlags;
+
     Object.keys(envFlags).forEach(flag => {
        let binding = path.scope.getBinding(flag);
        if (binding &&
           binding.path.isImportSpecifier() &&
           binding.path.parent.source.value === this.envFlagsSource) {
 
-         binding.referencePaths.forEach(p => p.replaceWith(builder.t.booleanLiteral(envFlags[flag])));
+         binding.referencePaths.forEach(p => p.replaceWith(this.builder.t.booleanLiteral(envFlags[flag])));
        }
     });
   }
 
   _inlineSvelteFlags(path) {
-    let { svelteMap, envFlags, builder } = this;
+    let svelteMap = this.svelteMap;
+    let envFlags = this.envFlags;
+    let builder = this.builder;
+
     let sources = Object.keys(svelteMap);
     sources.forEach((source) => {
       Object.keys(svelteMap[source]).forEach((flag) => {
         let binding = path.scope.getBinding(flag);
         if (binding !== undefined) {
           binding.referencePaths.forEach((p) => {
+            let t = builder.t;
             if (envFlags.DEBUG) {
               if (svelteMap[source][flag] === false) {
-                let { t } = builder;
                 if (!p.parentPath.isIfStatement()) { return; }
                 let consequent = p.parentPath.get('consequent');
-                consequent.unshiftContainer('body', builder.t.throwStatement(
+                consequent.unshiftContainer('body', t.throwStatement(
                   t.newExpression(t.identifier('Error'), [t.stringLiteral(`You indicated you don't have any deprecations, however you are relying on ${flag}.`)])
                 ));
               }
             } else {
               if (p.parentPath.isIfStatement()) {
-                p.replaceWith(builder.t.booleanLiteral(svelteMap[source][flag]));
+                p.replaceWith(t.booleanLiteral(svelteMap[source][flag]));
               }
             }
           });
@@ -130,8 +133,8 @@ export default class Macros {
    */
   build(path) {
     let expression = path.node.expression;
-    let { builder, localDebugBindings } = this;
-    if (builder.t.isCallExpression(expression) && localDebugBindings.some((b) => b.node.name === expression.callee.name)) {
+
+    if (this.builder.t.isCallExpression(expression) && this.localDebugBindings.some((b) => b.node.name === expression.callee.name)) {
       let imported = path.scope.getBinding(expression.callee.name).path.node.imported.name;
       this.builder[`${imported}`](path);
     }
@@ -152,31 +155,23 @@ export default class Macros {
   }
 
   _detectForeignFeatureFlag(specifiers, source) {
-    let { featuresMap } = this;
     specifiers.forEach((specifier) => {
-      if (specifier.imported && featuresMap[source][specifier.imported.name] !== null) {
+      if (specifier.imported && this.featuresMap[source][specifier.imported.name] !== null) {
         throw new Error(`Imported ${specifier.imported.name} from ${source} which is not a supported flag.`);
       }
     });
   }
 
   _cleanImports(path) {
-    let {
-      debugHelpers,
-      builder,
-      featureFlags,
-      featureSources
-    } = this;
-
     let body = path.get('body');
 
     if (!this.envFlags.DEBUG) {
       for (let i = 0; i < body.length; i++) {
         let decl = body[i];
 
-        if (builder.t.isImportDeclaration(decl)) {
+        if (this.builder.t.isImportDeclaration(decl)) {
           let source = decl.node.source.value;
-          if (featureSources.indexOf(source) > -1) {
+          if (this.featureSources.indexOf(source) > -1) {
             if (decl.node.specifiers.length > 0) {
               this._detectForeignFeatureFlag(decl.node.specifiers, source);
             } else {
@@ -188,7 +183,7 @@ export default class Macros {
       }
     }
 
-    if (!debugHelpers.module) {
+    if (!this.debugHelpers.module) {
       if (this.localDebugBindings.length > 0) {
         this.localDebugBindings[0].parentPath.parentPath
         let importPath = this.localDebugBindings[0].findParent(p => p.isImportDeclaration());

src/lib/utils/macros.js

@@ -1,13 +1,13 @@
-import { satisfies } from 'semver';
+'use strict';
 
-export function normalizeOptions(options) {
-  let {
-    features = [],
-    debugTools,
-    envFlags,
-    externalizeHelpers,
-    svelte
-  } = options;
+const satisfies = require('semver').satisfies;
+
+function normalizeOptions(options) {
+  let features = options.features || [];
+  let debugTools = options.debugTools;
+  let envFlags = options.envFlags;
+  let externalizeHelpers = options.externalizeHelpers;
+  let svelte = options.svelte;
 
   let featureSources = [];
   let featuresMap = {};
@@ -52,10 +52,8 @@ export function normalizeOptions(options) {
     throw new Error('You must specify `debugTools.source`');
   }
 
-  let {
-    source: debugToolsImport,
-    assertPredicateIndex
-  } = debugTools;
+  let debugToolsImport = debugTools.source;
+  let assertPredicateIndex = debugTools.assertPredicateIndex;
 
   let envFlagsImport;
   let _envFlags = {};
@@ -87,3 +85,7 @@ export function normalizeOptions(options) {
     }
   };
 }
+
+module.exports = {
+  normalizeOptions,
+};

src/lib/utils/normalize-options.js

@@ -1,8 +1,10 @@
-import DebugToolsPlugin from '../index';
-import { transform } from 'babel-core';
-import { expect } from 'chai';
-import { file } from 'chai-files';
-import { lstatSync, writeFileSync } from 'fs';
+'use strict';
+
+const DebugToolsPlugin = require('../index');
+const transform = require('babel-core').transform;
+const expect = require('chai').expect;
+const file = require('chai-files').file;
+const lstatSync = require('fs').lstatSync;
 
 const presets = [["latest", {
   "es2015": false,