added options.define, evaluate conditionals, fixes webpack#99

sokra · sokra · commit a37948d11430 · 2013-09-13T11:17:57.000+02:00
diff --git a/lib/BasicEvaluatedExpression.js b/lib/BasicEvaluatedExpression.js
@@ -28,6 +28,25 @@ BasicEvaluatedExpression.prototype.isArray = function() {
 BasicEvaluatedExpression.prototype.isWrapped = function() {
 	return Object.prototype.hasOwnProperty.call(this, "prefix");
 };
+BasicEvaluatedExpression.prototype.asBool = function() {
+	if(this.isBoolean()) return this.bool;
+	else if(this.isString()) return !!this.string;
+	else if(this.isNumber()) return !!this.number;
+	else if(this.isRegExp()) return true;
+	else if(this.isArray()) return true;
+	else if(this.isWrapped()) return this.prefix || this.postfix ? true : undefined;
+	return undefined;
+};
+BasicEvaluatedExpression.prototype.set = function(value) {
+	if(typeof value === "string") return this.setString(value);
+	if(typeof value === "number") return this.setNumber(value);
+	if(typeof value === "boolean") return this.setBoolean(value);
+	if(value instanceof RegExp) return this.setRegExp(value);
+	if(Array.isArray(value)) return this.setItems(value.map(function(item) {
+		return new BasicEvaluatedExpression().set(item);
+	}));
+	return this;
+};
 BasicEvaluatedExpression.prototype.setString = function(str) {
 	if(str === null)
 		delete this.string;
diff --git a/lib/ConstPlugin.js b/lib/ConstPlugin.js
@@ -18,9 +18,20 @@ ConstPlugin.prototype.apply = function(compiler) {
 	});
 	compiler.parser.plugin("statement if", function(statement) {
 		var param = this.evaluateExpression(statement.test);
-		if(param.isBoolean()) {
-			this.state.current.addDependency(new ConstDependency(param.bool + "", param.range));
-			return param.bool;
+		var bool = param.asBool();
+		if(typeof bool === "boolean") {
+			if(statement.test.type !== "Literal")
+				this.state.current.addDependency(new ConstDependency(bool + "", param.range));
+			return bool;
+		}
+	});
+	compiler.parser.plugin("expression ?:", function(expression) {
+		var param = this.evaluateExpression(expression.test);
+		var bool = param.asBool();
+		if(typeof bool === "boolean") {
+			if(expression.test.type !== "Literal")
+				this.state.current.addDependency(new ConstDependency(bool + "", param.range));
+			return bool;
 		}
 	});
 	compiler.parser.plugin("evaluate Identifier __resourceQuery", function(expr) {
diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.js
@@ -0,0 +1,47 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ConstDependency = require("./dependencies/ConstDependency");
+var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
+
+function DefinePlugin(definitions) {
+	this.definitions = definitions;
+}
+module.exports = DefinePlugin;
+DefinePlugin.prototype.apply = function(compiler) {
+	var definitions = this.definitions;
+	Object.keys(definitions).forEach(function(key) {
+		var value = definitions[key];
+		var code = "(" + JSON.stringify(value, function(key, value) {
+			if(typeof value === "function") return value.toString();
+			if(value instanceof RegExp) return value.toString();
+			if(value instanceof Date) return "new Date(" + value.getTime() + ")";
+			return value;
+		}) + ")";
+		compiler.parser.plugin("evaluate Identifier " + key, function(expr) {
+			var res = new BasicEvaluatedExpression();
+			res.set(value);
+			res.setRange(expr.range);
+			return res;
+		});
+		compiler.parser.plugin("evaluate typeof " + key, function(expr) {
+			var res = new BasicEvaluatedExpression();
+			res.setString(typeof value);
+			res.setRange(expr.range);
+			return res;
+		});
+		compiler.parser.plugin("expression " + key, function(expr) {
+			var dep = new ConstDependency(code, expr.range);
+			dep.loc = expr.loc;
+			this.state.current.addDependency(dep);
+			return true;
+		});
+		compiler.parser.plugin("typeof " + key, function(expr) {
+			var dep = new ConstDependency(JSON.stringify(typeof value), expr.range);
+			dep.loc = expr.loc;
+			this.state.current.addDependency(dep);
+			return true;
+		});
+	});
+};
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -192,18 +192,24 @@ Parser.prototype.initializeEvaluating = function() {
 		return new BasicEvaluatedExpression().setString(result).setRange(expr.range);
 	});
 	this.plugin("evaluate ConditionalExpression", function(expr) {
-		var consequent = this.evaluateExpression(expr.consequent);
-		var alternate = this.evaluateExpression(expr.alternate);
-		if(!consequent || !alternate) return;
-		var res = new BasicEvaluatedExpression();
-		if(consequent.isConditional())
-			res.setOptions(consequent.options);
-		else
-			res.setOptions([consequent]);
-		if(alternate.isConditional())
-			res.addOptions(alternate.options);
-		else
-			res.addOptions([alternate]);
+		var condition = this.evaluateExpression(expr.test);
+		var conditionValue = condition.asBool();
+		if(conditionValue === undefined) {
+			var consequent = this.evaluateExpression(expr.consequent);
+			var alternate = this.evaluateExpression(expr.alternate);
+			if(!consequent || !alternate) return;
+			var res = new BasicEvaluatedExpression();
+			if(consequent.isConditional())
+				res.setOptions(consequent.options);
+			else
+				res.setOptions([consequent]);
+			if(alternate.isConditional())
+				res.addOptions(alternate.options);
+			else
+				res.addOptions([alternate]);
+		} else {
+			var res = this.evaluateExpression(conditionValue ? expr.consequent : expr.alternate);
+		}
 		res.setRange(expr.range);
 		return res;
 	});
@@ -414,9 +420,18 @@ Parser.prototype.walkExpression = function walkExpression(expression) {
 		this.walkExpression(expression.right);
 		break;
 	case "ConditionalExpression":
-		this.walkExpression(expression.test);
-		this.walkExpression(expression.alternate);
-		this.walkExpression(expression.consequent);
+		var result = this.applyPluginsBailResult("expression ?:", expression);
+		if(result === undefined) {
+			this.walkExpression(expression.test);
+			this.walkExpression(expression.consequent);
+			if(expression.alternate)
+				this.walkExpression(expression.alternate);
+		} else {
+			if(result)
+				this.walkExpression(expression.consequent);
+			else if(expression.alternate)
+				this.walkExpression(expression.alternate);
+		}
 		break;
 	case "NewExpression":
 		this.walkExpression(expression.callee);
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -17,6 +17,7 @@ var ConstPlugin = require("./ConstPlugin");
 var RequireJsStuffPlugin = require("./RequireJsStuffPlugin");
 var NodeStuffPlugin = require("./NodeStuffPlugin");
 var CompatibilityPlugin = require("./CompatibilityPlugin");
+var DefinePlugin = require("./DefinePlugin");
 
 var CommonJsPlugin = require("./dependencies/CommonJsPlugin");
 var AMDPlugin = require("./dependencies/AMDPlugin");
@@ -214,6 +215,18 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		}
 	}
 
+	if(options.define !== false) {
+		var defineObject = {};
+		if(typeof options.define === "object") {
+			Object.keys(options.define).forEach(function(key) {
+				defineObject[key] = options.define[key];
+			});
+		}
+		if(defineObject.DEBUG === undefined)
+			defineObject.DEBUG = !!options.debug;
+		compiler.apply(new DefinePlugin(defineObject));
+	}
+
 	compiler.applyPlugins("after-plugins", compiler);
 	compiler.resolvers.normal.apply(
 		new UnsafeCachePlugin(options.resolve.unsafeCache),
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.11.0-beta16",
+	"version": "0.11.0-beta17",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -196,6 +196,13 @@ describe("main", function() {
 			if(typeof module != "object") module = require("fail");
 			if(typeof exports == "undefined") exports = require("fail");
 		});
+
+		it("should define DEBUG", function() {
+			DEBUG.should.be.eql(false);
+			(typeof DEBUG).should.be.eql("boolean");
+			var x = require(DEBUG ? "fail" : "./a");
+			var y = DEBUG ? require("fail") : require("./a");
+		});
 	});
 
 	describe("polyfilling", function() {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.11.0-beta16",`
	`3`	`+ "version": "0.11.0-beta17",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD/Labeled Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`