@google/earthengine 1.7.10 → 1.7.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/earthengine",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "description": "JavaScript client for Google Earth Engine API.",
   "author": "Google LLC",
   "license": "Apache-2.0",

package/src/apiclient.js

@@ -24,7 +24,7 @@ const {trustedResourceUrl} = goog.require('safevalues.index');
 /** @namespace */
 const apiclient = {};
 
-const API_CLIENT_VERSION = '1.7.10';
+const API_CLIENT_VERSION = '1.7.12';
 
 exports.VERSION = apiVersion.VERSION;
 exports.API_CLIENT_VERSION = API_CLIENT_VERSION;

package/src/apifunction.js

@@ -167,11 +167,11 @@ ee.ApiFunction.lookup = function(name) {
  * Looks up an API function by name, but doesn't throw an error.
  *
  * @param {string} name The name of the function to get.
- * @return {!ee.ApiFunction} The requested function or null if it's not found.
+ * @return {!ee.ApiFunction|null} The requested function or null if it's not found.
  */
 ee.ApiFunction.lookupInternal = function(name) {
   ee.ApiFunction.initialize();
-  return ee.ApiFunction.api_[name] || null;
+  return ee.ApiFunction.api_.hasOwnProperty(name) ? ee.ApiFunction.api_[name] : null;
 };
 
 
@@ -244,49 +244,63 @@ ee.ApiFunction.reset = function() {
 ee.ApiFunction.importApi = function(target, prefix, typeName, opt_prepend) {
   ee.ApiFunction.initialize();
   const prepend = opt_prepend || '';
-  goog.object.forEach(ee.ApiFunction.api_, function(apiFunc, name) {
-    const parts = name.split('.');
-    if (parts.length == 2 && parts[0] == prefix) {
-      const fname = prepend + parts[1];
-      const signature = apiFunc.getSignature();
-
-      // Mark signatures as used.
-      ee.ApiFunction.boundSignatures_[name] = true;
-
-      // Decide whether this is a static or an instance function.
-      let isInstance = false;
-      if (signature['args'].length) {
-        const firstArgType = signature['args'][0]['type'];
-        isInstance = firstArgType != 'Object' &&
-                     ee.Types.isSubtype(firstArgType, typeName);
-      }
-      // Assume we have a constructor Function if we get an instance method.
-      const destination =
-          isInstance ? /** @type {!Function} */(target).prototype : target;
+  const api = ee.ApiFunction.api_;
+  for (const name in api) {
+    // "names" in API either look like:
+    // - `Array` (base constructor), or
+    // - `Array.method` (methods)
+
+    // Ignore properties inherited from the prototype chain.
+    if (!Object.prototype.hasOwnProperty.call(api, name)) {
+      continue;
+    }
+    const apiFunc = api[name];
+    const parts = name.split('.');  // Should be api group and api method.
+    if (parts.length !== 2 || parts[0] !== prefix) {
+      continue;
+    }
 
-      if (fname in destination && !destination[fname]['signature']) {
-        // Don't overwrite client-defined functions.
-        return;
-      }
+    const apiMethod = parts[1];
+
+    const fname = prepend + apiMethod;
+    const signature = apiFunc.getSignature();
+
+    // Mark signatures as used.
+    ee.ApiFunction.boundSignatures_[name] = true;
 
-      // Add the actual function
-      /**
-       * @param {*} var_args
-       * @return {!ee.ComputedObject}
-       * @this {*}
-       **/
-      destination[fname] = function(var_args) {
-        return apiFunc.callOrApply(
-            isInstance ? this : undefined,
-            Array.prototype.slice.call(arguments, 0));
-      };
-      // Add a friendly formatting.
-      destination[fname].toString =
-          goog.bind(apiFunc.toString, apiFunc, fname, isInstance);
-      // Attach the signature object for documentation generators.
-      destination[fname]['signature'] = signature;
+    // Decide whether this is a static or an instance function.
+    let isInstance = false;
+    if (signature['args'].length) {
+      const firstArgType = signature['args'][0]['type'];
+      isInstance = firstArgType != 'Object' &&
+           ee.Types.isSubtype(firstArgType, typeName);
     }
-  });
+    // Assume we have a constructor Function if we get an instance method.
+    const destination =
+        isInstance ? /** @type {!Function} */ (target).prototype : target;
+
+    if (fname in destination && !destination[fname]['signature']) {
+      // Don't overwrite client-defined functions.
+      continue;
+    }
+
+    // Add the actual function
+    /**
+     * @param {*} var_args
+     * @return {!ee.ComputedObject}
+     * @this {*}
+     **/
+    destination[fname] = function(var_args) {
+      return apiFunc.callOrApply(
+          isInstance ? this : undefined,
+          Array.prototype.slice.call(arguments, 0));
+    };
+    // Add a friendly formatting.
+    destination[fname].toString =
+        goog.bind(apiFunc.toString, apiFunc, fname, isInstance);
+    // Attach the signature object for documentation generators.
+    destination[fname]['signature'] = signature;
+  }
 };