Remove unused exports and modules

src/common/argscheck.js

@@ -66,9 +66,6 @@ function extractParamName (callee, argIndex) {
  * @throws {TypeError} if args do not satisfy spec
  */
 function checkArgs (spec, functionName, args, opt_callee) {
-    if (!moduleExports.enableChecks) {
-        return;
-    }
     var errMsg = null;
     var typeName;
     for (var i = 0; i < spec.length; ++i) {
@@ -105,4 +102,3 @@ function getValue (value, defaultValue) {
 
 moduleExports.checkArgs = checkArgs;
 moduleExports.getValue = getValue;
-moduleExports.enableChecks = true;

src/common/channel.js

@@ -19,7 +19,6 @@
  *
 */
 
-var utils = require('cordova/utils');
 var nextGuid = 1;
 
 /**
@@ -171,7 +170,7 @@ Channel.prototype.subscribe = function (eventListenerOrFunction, eventListener)
 
     guid = eventListenerOrFunction.observer_guid;
     if (typeof eventListener === 'object') {
-        handleEvent = utils.close(eventListener, handleEvent);
+        handleEvent = handleEvent.bind(eventListener);
     }
 
     if (!guid) {

src/common/modulemapper.js

@@ -18,7 +18,7 @@
  *
 */
 
-var builder = require('cordova/builder');
+var utils = require('cordova/utils');
 var moduleMap = define.moduleMap;
 var symbolList;
 var deprecationMap;
@@ -47,10 +47,6 @@ exports.merges = function (moduleName, symbolPath, opt_deprecationMessage) {
     addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
 };
 
-exports.defaults = function (moduleName, symbolPath, opt_deprecationMessage) {
-    addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
-};
-
 exports.runs = function (moduleName) {
     addEntry('r', moduleName, null);
 };
@@ -64,6 +60,58 @@ function prepareNamespace (symbolPath, context) {
     }, context);
 }
 
+function clobber (obj, key, value) {
+    var needsProperty = false;
+    try {
+        obj[key] = value;
+    } catch (e) {
+        needsProperty = true;
+    }
+    // Getters can only be overridden by getters.
+    if (needsProperty || obj[key] !== value) {
+        utils.defineGetter(obj, key, function () {
+            return value;
+        });
+    }
+}
+
+function assignOrWrapInDeprecateGetter (obj, key, value, message) {
+    if (message) {
+        utils.defineGetter(obj, key, function () {
+            console.log(message);
+            delete obj[key];
+            clobber(obj, key, value);
+            return value;
+        });
+    } else {
+        clobber(obj, key, value);
+    }
+}
+
+/**
+ * Merge properties from one object onto another recursively.  Properties from
+ * the src object will overwrite existing target property.
+ *
+ * @param target Object to merge properties into.
+ * @param src Object to merge properties from.
+ */
+function recursiveMerge (target, src) {
+    for (var prop in src) {
+        if (src.hasOwnProperty(prop)) {
+            if (target.prototype && target.prototype.constructor === target) {
+                // If the target object is a constructor override off prototype.
+                clobber(target.prototype, prop, src[prop]);
+            } else {
+                if (typeof src[prop] === 'object' && typeof target[prop] === 'object') {
+                    recursiveMerge(target[prop], src[prop]);
+                } else {
+                    clobber(target, prop, src[prop]);
+                }
+            }
+        }
+    }
+}
+
 exports.mapModules = function (context) {
     var origSymbols = {};
     context.CDV_origSymbols = origSymbols;
@@ -85,12 +133,12 @@ exports.mapModules = function (context) {
         var target = parentObj[lastName];
 
         if (strategy === 'm' && target) {
-            builder.recursiveMerge(target, module);
-        } else if ((strategy === 'd' && !target) || (strategy !== 'd')) {
+            recursiveMerge(target, module);
+        } else {
             if (!(symbolPath in origSymbols)) {
                 origSymbols[symbolPath] = target;
             }
-            builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
+            assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
         }
     }
 };

src/common/utils.js

@@ -47,58 +47,21 @@ utils.defineGetterSetter = function (obj, key, getFunc, opt_setFunc) {
  */
 utils.defineGetter = utils.defineGetterSetter;
 
-utils.arrayIndexOf = function (a, item) {
-    if (a.indexOf) {
-        return a.indexOf(item);
-    }
-    var len = a.length;
-    for (var i = 0; i < len; ++i) {
-        if (a[i] === item) {
-            return i;
-        }
-    }
-    return -1;
-};
-
-/**
- * Returns whether the item was found in the array.
- */
-utils.arrayRemove = function (a, item) {
-    var index = utils.arrayIndexOf(a, item);
-    if (index !== -1) {
-        a.splice(index, 1);
-    }
-    return index !== -1;
-};
-
 utils.typeName = function (val) {
     return Object.prototype.toString.call(val).slice(8, -1);
 };
 
-/**
- * Returns an indication of whether the argument is an array or not
- */
-utils.isArray = Array.isArray ||
-                function (a) { return utils.typeName(a) === 'Array'; };
-
-/**
- * Returns an indication of whether the argument is a Date or not
- */
-utils.isDate = function (d) {
-    return (d instanceof Date);
-};
-
 /**
  * Does a deep clone of the object.
  */
 utils.clone = function (obj) {
-    if (!obj || typeof obj === 'function' || utils.isDate(obj) || typeof obj !== 'object') {
+    if (!obj || typeof obj === 'function' || obj instanceof Date || typeof obj !== 'object') {
         return obj;
     }
 
     var retVal, i;
 
-    if (utils.isArray(obj)) {
+    if (Array.isArray(obj)) {
         retVal = [];
         for (i = 0; i < obj.length; ++i) {
             retVal.push(utils.clone(obj[i]));
@@ -119,16 +82,6 @@ utils.clone = function (obj) {
     return retVal;
 };
 
-/**
- * Returns a wrapped version of the function
- */
-utils.close = function (context, func, params) {
-    return function () {
-        var args = params || arguments;
-        return func.apply(context, args);
-    };
-};
-
 // ------------------------------------------------------------------------------
 function UUIDcreatePart (length) {
     var uuidpart = '';
@@ -168,14 +121,3 @@ utils.extend = (function () {
         Child.prototype.constructor = Child;
     };
 }());
-
-/**
- * Alerts a message in any available way: alert or console.log.
- */
-utils.alert = function (msg) {
-    if (window.alert) {
-        window.alert(msg);
-    } else if (console && console.log) {
-        console.log(msg);
-    }
-};

src/cordova.js

@@ -237,16 +237,6 @@ var cordova = {
             cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg, 'error': err });
             throw err;
         }
-    },
-
-    addConstructor: function (func) {
-        channel.onCordovaReady.subscribe(function () {
-            try {
-                func();
-            } catch (e) {
-                console.log('Failed to run constructor: ' + e);
-            }
-        });
     }
 };
 

test/test.argscheck.js

@@ -73,11 +73,6 @@ describe('argscheck', function () {
         var testFunc = createTestFunc(true);
         expect(function () { testFunc(null, null, null, null, null, new Date()); }).toThrowError('Wrong type for parameter "func" of testFunc: Expected Function, but got Date.');
     });
-    it('Test#011 : should not throw when checking is disabled', function () {
-        var testFunc = createTestFunc(false);
-        argscheck.enableChecks = false;
-        testFunc();
-    });
     it('Test#012 : should be able to extract from all kinds of parameter formats', () => {
         const check = args => argscheck.checkArgs('ss', 'testFn', args);