Merge pull request facebook#106 from benjamn/rename-woodchipper

petehunt · petehunt · commit 405be0f966e8 · 2013-06-17T15:55:25.000-07:00
Rename Woodchipper to ConstantVisitor, and simplify the vendor/constants.js interface
diff --git a/bin/jsx b/bin/jsx
@@ -3,7 +3,7 @@
 
 var visitors = require('../vendor/fbtransform/visitors').transformVisitors;
 var transform = require('../vendor/fbtransform/lib/transform').transform;
-var debranch = require("../vendor/woodchipper").debranch;
+var propagate = require("../vendor/constants").propagate;
 
 require("commoner").resolve(function(id) {
   var context = this;
@@ -25,18 +25,12 @@ require("commoner").resolve(function(id) {
 
 }).process(function(id, source) {
   var context = this;
+  var constants = context.config.constants || {};
 
   // This is where JSX, ES6, etc. desugaring happens.
   source = transform(visitors.react, source).code;
 
-  return context.makePromise(function(callback) {
-    var constants = context.config.constants || {};
-
-    // Debranching means removing any obviously dead code after
-    // replacing constant conditional expressions with literal
-    // (boolean) values.
-    debranch(constants, source, function(source) {
-      callback(null, source);
-    });
-  });
+  // Constant propagation means removing any obviously dead code after
+  // replacing constant expressions with literal (boolean) values.
+  return propagate(constants, source);
 });
diff --git a/vendor/constants.js b/vendor/constants.js
@@ -17,17 +17,13 @@
 
 var recast = require('recast');
 
-exports.debranch = function(constants, source, writeback) {
-  recast.runString(
-    source,
-    function(ast, callback) {
-      callback(new Woodchipper(constants).visit(ast));
-    },
-    { writeback: writeback }
-  );
+exports.propagate = function(constants, source) {
+  var ast = recast.parse(source);
+  ast = new ConstantVisitor(constants).visit(ast);
+  return recast.print(ast);
 };
 
-var Woodchipper = recast.Visitor.extend({
+var ConstantVisitor = recast.Visitor.extend({
   init: function(constants) {
     this.constants = constants || {};
   },
@@ -57,6 +53,6 @@ var Woodchipper = recast.Visitor.extend({
 if (!module.parent) {
   var constants = JSON.parse(process.argv[3]);
   recast.run(function(ast, callback) {
-    callback(new Woodchipper(constants).visit(ast));
+    callback(new ConstantVisitor(constants).visit(ast));
   });
 }
