Build v1.9.0

Author: matthopson

lib/teamsnap.js

@@ -2768,13 +2768,22 @@ exports.deleteTeam = function(team, callback) {
 };
 
 exports.bulkLoad = function(teamId, types, callback) {
-  var params;
-  if (!this.isId(teamId)) {
-    throw new TSArgsError('teamsnap.bulkLoad', 'teamId must be provided');
-  }
-  if (typeof types === 'function') {
-    callback = types;
-    types = null;
+  var loadParams, params;
+  if (typeof teamId === 'object') {
+    loadParams = teamId;
+    if (!this.isId(loadParams.teamId)) {
+      throw new TSArgsError('teamsnap.bulkLoad', 'teamId must be provided');
+    }
+    teamId = loadParams.teamId;
+    types = loadParams.types;
+  } else {
+    if (!this.isId(teamId)) {
+      throw new TSArgsError('teamsnap.bulkLoad', 'teamId must be provided');
+    }
+    if (typeof types === 'function') {
+      callback = types;
+      types = null;
+    }
   }
   if (!Array.isArray(types)) {
     types = this.getTeamTypes();
@@ -2784,6 +2793,9 @@ exports.bulkLoad = function(teamId, types, callback) {
     teamId: teamId,
     types: types.map(this.underscoreType).join(',')
   };
+  if ((loadParams != null ? loadParams.scopeTo : void 0) != null) {
+    params.scopeTo = this.underscoreType(loadParams.scopeTo);
+  }
   return this.collections.root.queryItems('bulkLoad', params, callback);
 };
 
@@ -3854,7 +3866,7 @@ MetaList = (function() {
   };
 
   MetaList.prototype._request = function(request, method, rel, params, type) {
-    var data, entry, key, value;
+    var data, entry, filteredOn, itemCollection, key, value;
     if (!(entry = this[rel])) {
       throw new TSError("Unable to find rel '" + rel + "'");
     }
@@ -3874,6 +3886,12 @@ MetaList = (function() {
         }
         if (entry.params.hasOwnProperty(key)) {
           data[underscore(key)] = value;
+        } else if (key.indexOf('__') !== -1) {
+          filteredOn = key.split('__');
+          itemCollection = teamsnap.getCollectionForItem(filteredOn[0]);
+          if (itemCollection.queries.search.params.hasOwnProperty(filteredOn[1])) {
+            data[underscore(key)] = value;
+          }
         }
       }
     }
@@ -5769,7 +5787,7 @@ ref = require('./model'), Collection = ref.Collection, Item = ref.Item;
 require('./errors');
 
 TeamSnap = (function() {
-  TeamSnap.prototype.version = '1.8.1';
+  TeamSnap.prototype.version = '1.9.0';
 
   TeamSnap.prototype.promises = promises;