update to v1.2.0

1. add `Proxy.revocable` method 
2. add a test case

Author: ambit-tsai

README.md

@@ -9,6 +9,7 @@ Due to the limitations of ES3, the polyfill supports just a limited number of pr
 * apply
 * construct
 
+The `Proxy.revocable` method is also supported, but only for calls to the above traps.
 
 #### Installation
 
@@ -44,4 +45,5 @@ var proxy = new Proxy(target, handler);
 <script src="path/to/babel-polyfill.js" type="text/javascript"></script>
 <script src="path/to/es6-proxy-polyfill.js" type="text/javascript"></script>
 ```
-2. The code has been tested on Node.js 0.10.48 and IE8, and it may work in other environments too.
+2. The code has been tested on Node.js 0.10.48 and IE8, and it may work in other environments too;
+3. The revoked `Proxy` object will not throw errors when it's properties are accessed.

README_zh.md

@@ -9,6 +9,7 @@
 * apply
 * construct
 
+`Proxy.revocable`方法也被支持，但只限于调用上面的'traps'。
 
 #### 安装
 
@@ -44,4 +45,5 @@ var proxy = new Proxy(target, handler);
 <script src="path/to/babel-polyfill.js" type="text/javascript"></script>
 <script src="path/to/es6-proxy-polyfill.js" type="text/javascript"></script>
 ```
-2. 代码已经在Node.js 0.10.48 和 IE8 测试过，而且它也应该能够运行在其他环境下。
+2. 代码已经在Node.js 0.10.48 和 IE8 测试过，而且它也应该能够运行在其他环境下；
+3. 当自身属性被访问时，被撤销的`Proxy`对象不会抛出错误。

dist/es6-proxy-polyfill.js

@@ -1,17 +1,17 @@
 {
   "name": "es6-proxy-polyfill",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Proxy polyfill based on ES3 supports IE8, Node.js, etc.",
   "main": "src/es6-proxy-polyfill.js",
   "scripts": {
     "build": "uglifyjs src/es6-proxy-polyfill.js -c -m reserved=[Proxy] --ie8 --comments --source-map -o dist/es6-proxy-polyfill.js"
   },
   "keywords": [
+    "es6-proxy",
     "proxy-polyfill",
     "proxy",
     "polyfill",
-    "ie8",
-    "es6"
+    "ie8"
   ],
   "author": "[email protected]",
   "license": "Apache-2.0",

dist/es6-proxy-polyfill.js.map

@@ -1,6 +1,6 @@
 /**
  * ES6 Proxy Polyfill
- * @version 1.0.0
+ * @version 1.2.0
  * @author Ambit Tsai <[email protected]>
  * @license Apache-2.0
  * @see {@link https://github.com/ambit-tsai/es6-proxy-polyfill}
@@ -67,11 +67,7 @@
 		}
 		if(handler.construct == null){
 			obj = target.apply(thisArg, argsList);
-			if(obj instanceof Object){
-				return obj;
-			}else{
-				return thisArg;
-			}
+			return obj instanceof Object? obj: thisArg;
 		}else if(typeof handler.construct === 'function'){
 			obj = handler.construct(target, argsList);
 			if(obj instanceof Object){
@@ -88,9 +84,10 @@
 	 * Create a Proxy object
 	 * @param {Function} target
 	 * @param {Object} handler
+	 * @param {Object} result
 	 * @returns {Function}
 	 */
-	function createProxy(target, handler){
+	function createProxy(target, handler, result){
 		// Check the type of arguments
 		if(typeof target !== 'function'){
 			throwTypeError('Proxy polyfill only support function target');
@@ -112,6 +109,17 @@
 		P.prototype = target.prototype;	// copy target's prototype
 		setProto(P, getProto(target));	// copy target's [[Prototype]]
 
+		// The Proxy revocation function
+		result && (result.revoke = function(){
+			member.target = null;
+			member.handler = null;
+			for(var key in P){			// delete proxy's properties
+				P.hasOwnProperty(key) && delete P[key];
+			}
+			P.prototype = {};			// reset proxy's prototype
+			setProto(P, {});			// reset proxy's [[Prototype]]
+		});
+
 		return P;
 	}
 
@@ -129,11 +137,23 @@
 			throwTypeError("Constructor Proxy requires 'new'");
 		}
 	}
-	
-	// Prevent function declaration from being translated into function expression by UglifyJS.
-	// Function expression called by 'new' will cause an inconsistent result between old IE and
-	// others when runing the code - `this instanceof P`.
-	Proxy.revocable;
+
+	/**
+	 * Create a revocable Proxy object
+	 * @param {Function} target
+	 * @param {Object} handler
+	 * @returns {{proxy, revoke}}
+	 */
+	Proxy.revocable = function(target, handler){
+		var result = {};
+		result.proxy = createProxy(target, handler, result);
+		return result;
+	};
 
 	global.Proxy = Proxy;
-}(typeof window==='object'? window: global));
+}(
+	typeof window === 'object'? 
+		window: 
+		// Using `this` for web workers & supports Browserify / Webpack.
+		typeof global==='object'? global: this
+));

package.json

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=utf-8">
+	<title>proxy-revocable</title>
+</head>
+<body>
+	<script src="../../dist/es6-proxy-polyfill.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		var person = {
+			name: "Ambit_Tsai",
+			sayHello: function(){
+				document.write(">"+this.name+": Hey man!<br>");
+			}
+		};
+		
+		var result = Proxy.revocable(person.sayHello, {
+			apply: function(func, ctx, args){
+				document.write("Trigger 'apply' trap<br>");
+				func.apply(ctx, args);
+			}
+		});
+		person.sayHello = result.proxy;
+		
+		document.write("Call 'sayHello' method<br>");
+		person.sayHello();
+		
+		document.write("Revoke proxy<br>");
+		result.revoke();
+		
+		try{
+			document.write("Call 'sayHello' method again<br>");
+			person.sayHello();
+		}catch(err){
+			document.write(err.message+"<br>");
+		}
+	</script>
+</body>
+</html>

src/es6-proxy-polyfill.js

@@ -8,25 +8,25 @@
 	<script src="../../dist/es6-proxy-polyfill.js" type="text/javascript"></script>
 	<script type="text/javascript">
 		function Person(name){
-			document.write("Set this.name to '"+name+"'<br>");
+			document.write("Property 'name' is initialized to '"+name+"'<br>");
 			this.name = name;
 		}
 		Person.prototype.sayHello = function(){
 			document.write(">"+this.name+": Hey man!<br>");
 		};
 		Person.className = "Person";
 
-		var NewPerson = new Proxy(Person, {
+		var ProxyClass = new Proxy(Person, {
 			construct: function(Target, args){
 				document.write("Trigger 'construct' trap<br>");
 				return new Target(args[0]);
 			}
 		});
 
-		document.write("NewPerson's className: '"+NewPerson.className+"' (need 'Object.assign')<br>");
+		document.write("ProxyClass's className: '"+ProxyClass.className+"' (Rely on 'Object.assign')<br>");
 
-		document.write("Create a NewPerson object<br>");
-		var person = new NewPerson("Ambit_Tsai");
+		document.write("Create a ProxyClass object<br>");
+		var person = new ProxyClass("Ambit_Tsai");
 
 		document.write("Call 'sayHello' method<br>");
 		person.sayHello();

test/browser/proxy-revocable.html

@@ -0,0 +1,28 @@
+require('../../dist/es6-proxy-polyfill');
+
+var person = {
+	name: "Ambit_Tsai",
+	sayHello: function(){
+		console.log(">"+this.name+": Hey man!");
+	}
+};
+var result = Proxy.revocable(person.sayHello, {
+	apply: function(func, ctx, args){
+		console.log("Trigger 'apply' trap");
+		func.apply(ctx, args);
+	}
+});
+person.sayHello = result.proxy;
+
+console.log("Call 'sayHello' method");
+person.sayHello();
+
+console.log("Revoke proxy");
+result.revoke();
+
+try{
+	console.log("Call 'sayHello' method again");
+	person.sayHello();
+}catch(err){
+	console.log(err.message);
+}

test/browser/trap-construct.html

@@ -1,25 +1,25 @@
 require('../../src/es6-proxy-polyfill');
 
 function Person(name){
-	console.log("Set this.name to '"+name+"'");
+	console.log("Property 'name' is initialized to '"+name+"'");
 	this.name = name;
 }
 Person.prototype.sayHello = function(){
 	console.log(">"+this.name+": Hey man!");
 };
 Person.className = "Person";
 
-var NewPerson = new Proxy(Person, {
+var ProxyClass = new Proxy(Person, {
 	construct: function(Target, args){
 		console.log("Trigger 'construct' trap");
 		return new Target(args[0]);
 	}
 });
 
-console.log("NewPerson's className: '"+NewPerson.className+"' (need 'Object.assign')");
+console.log("ProxyClass's className: '"+ProxyClass.className+"' (Rely on 'Object.assign')");
 
-console.log("Create a NewPerson object");
-var person = new NewPerson("Ambit_Tsai");
+console.log("Create a ProxyClass object");
+var person = new ProxyClass("Ambit_Tsai");
 
 console.log("Call 'sayHello' method");
 person.sayHello();