Changed the CommonJS compat wrapper to use amdefine instead of a cust…

…om-made shim.

js-array.js

@@ -3,8 +3,7 @@
  * require("./js-array").query("a=3", {}, [{a:1},{a:3}]) -> [{a:3}]
  *
  */
-
-({define:typeof define!="undefined"?define:function(deps, factory){module.exports = factory(exports, require("./parser"), require("./query"), require("./util/each"), require("./util/contains"));}}).
+if (typeof define !== 'function') { var define = require('amdefine')(module) }
 define(["exports", "./parser", "./query", "./util/each", "./util/contains"], function(exports, parser, QUERY, each, contains){
 //({define:typeof define!="undefined"?define:function(deps, factory){module.exports = factory(exports, require("./parser"));}}).
 //define(["exports", "./parser"], function(exports, parser){

package.json

@@ -39,6 +39,7 @@
     "promised-io": "http://github.com/kriszyp/promised-io/zipball/v0.2.1"
   },
   "dependencies": {
+    "amdefine": "^1.0.0",
     "promised-io": ">=0.3.0"
   },
   "devDependencies": {

parser.js

@@ -2,7 +2,7 @@
  * This module provides RQL parsing. For example:
  * var parsed = require("./parser").parse("b=3&le(c,5)");
  */
-({define:typeof define!="undefined"?define:function(deps, factory){module.exports = factory(exports, require("./util/contains"));}}).
+if (typeof define !== 'function') { var define = require('amdefine')(module) }
 define(["exports", "./util/contains"], function(exports, contains){
 
 var operatorMap = {

query.js

@@ -9,9 +9,7 @@
  *	 // for each object that matches the query
  * });
  */
-//({define:typeof define!="undefined"?define:function(deps, factory){module.exports = factory(exports, require("./parser"), require("./js-array"));}}).
-//define(["exports", "./parser", "./js-array"], function(exports, parser, jsarray){
-({define:typeof define!="undefined"?define:function(deps, factory){module.exports = factory(exports, require("./parser"), require("./util/each"));}}).
+if (typeof define !== 'function') { var define = require('amdefine')(module) }
 define(["exports", "./parser", "./util/each"], function(exports, parser, each){
 
 var parseQuery = parser.parseQuery;

util/contains.js

@@ -1,4 +1,4 @@
-({define:typeof define!=='undefined'?define:function(deps, factory){module.exports = factory(exports);}}).
+if (typeof define !== 'function') { var define = require('amdefine')(module) }
 define([], function(){
 return contains;
 

util/each.js

@@ -1,4 +1,4 @@
-({define:typeof define!=='undefined'?define:function(deps, factory){module.exports = factory(exports);}}).
+if (typeof define !== 'function') { var define = require('amdefine')(module) }
 define([], function(){
 return each;