@twilio/conversations 2.0.1-rc.9 → 2.1.0-rc.0

package/builds/twilio-conversations.js

@@ -6591,6 +6591,13 @@ this.Twilio.Conversations = (function (exports) {
 	var validateTypes_1 = browser$6.validateTypes = validateTypes;
 	var validateTypesAsync_1 = browser$6.validateTypesAsync = validateTypesAsync;
 
+	var attributesValidator = custom_1(function (value) {
+	  return [['string', 'number', 'boolean', 'object'].includes(_typeof$4(value)), 'a JSON type'];
+	});
+	var optionalAttributesValidator = custom_1(function (value) {
+	  return [['undefined', 'string', 'number', 'boolean', 'object'].includes(_typeof$4(value)), 'an optional JSON type'];
+	});
+
 	var browser$5 = {};
 
 	/*
@@ -9758,7 +9765,7 @@ this.Twilio.Conversations = (function (exports) {
 	  return User;
 	}(ReplayEventEmitter_1);
 
-	__decorate$1([validateTypesAsync_1(['string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], User.prototype, "updateAttributes", null);
+	__decorate$1([validateTypesAsync_1(attributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], User.prototype, "updateAttributes", null);
 
 	__decorate$1([validateTypesAsync_1(['string']), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], User.prototype, "updateFriendlyName", null);
 
@@ -34809,6 +34816,8 @@ this.Twilio.Conversations = (function (exports) {
 	   * @internal
 	   */
 	  function Participant(data, sid, conversation, links, services) {
+	    var _data$bindings;
+
 	    var _this;
 
 	    _classCallCheck$4(this, Participant);
@@ -34829,7 +34838,8 @@ this.Twilio.Conversations = (function (exports) {
 	      lastReadMessageIndex: Number.isInteger(data.lastConsumedMessageIndex) ? data.lastConsumedMessageIndex : null,
 	      lastReadTimestamp: data.lastConsumptionTimestamp ? parseTime$1(data.lastConsumptionTimestamp) : null,
 	      type: data.type || 'chat',
-	      userInfo: data.userInfo
+	      userInfo: data.userInfo,
+	      bindings: (_data$bindings = data.bindings) !== null && _data$bindings !== void 0 ? _data$bindings : {}
 	    };
 
 	    if (!data.identity && !data.type) {
@@ -34932,7 +34942,7 @@ this.Twilio.Conversations = (function (exports) {
 	      return this.state.roleSid;
 	    }
 	    /**
-	     * Message type of the participant.
+	     * Type of the participant.
 	     */
 
 	  }, {
@@ -34940,6 +34950,21 @@ this.Twilio.Conversations = (function (exports) {
 	    get: function get() {
 	      return this.state.type;
 	    }
+	    /**
+	     * Get the bindings mapping for the current participant.
+	     * Available binding depends on the participant type.
+	     * You could access it as `participant.bindings.sms?.address` or
+	     * using the type dynamically `participant.bindings[participant.type]`
+	     * just be aware that the binding information has different structure for
+	     * each participant type.
+	     * See also {ParticipantEmailBinding}, the only available currently binding descriptor.
+	     */
+
+	  }, {
+	    key: "bindings",
+	    get: function get() {
+	      return this.state.bindings;
+	    }
 	  }, {
 	    key: "_startTyping",
 	    value:
@@ -35026,6 +35051,11 @@ this.Twilio.Conversations = (function (exports) {
 	        }
 	      }
 
+	      if (data.bindings && !isEqual(this.state.bindings, data.bindings)) {
+	        this.state.bindings = data.bindings;
+	        updateReasons.push('bindings');
+	      }
+
 	      if (updateReasons.length > 0) {
 	        this.emit('updated', {
 	          participant: this,
@@ -35145,7 +35175,7 @@ this.Twilio.Conversations = (function (exports) {
 
 	_defineProperty$3(Participant, "updated", 'updated');
 
-	__decorate$1([validateTypesAsync_1(['string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Participant.prototype, "updateAttributes", null);
+	__decorate$1([validateTypesAsync_1(attributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Participant.prototype, "updateAttributes", null);
 
 	function _createSuper$6(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$6(); return function _createSuperInternal() { var Super = _getPrototypeOf$4(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf$4(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn$4(this, result); }; }
 
@@ -35325,19 +35355,38 @@ this.Twilio.Conversations = (function (exports) {
 
 	  }, {
 	    key: "getParticipants",
-	    value: function getParticipants() {
-	      var _this4 = this;
+	    value: function () {
+	      var _getParticipants = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3() {
+	        var _this4 = this;
 
-	      return this.rosterEntityPromise.then(function () {
-	        var participants = [];
+	        return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
+	          while (1) {
+	            switch (_context3.prev = _context3.next) {
+	              case 0:
+	                return _context3.abrupt("return", this.rosterEntityPromise.then(function () {
+	                  var participants = [];
 
-	        _this4.participants.forEach(function (participant) {
-	          return participants.push(participant);
-	        });
+	                  _this4.participants.forEach(function (participant) {
+	                    return participants.push(participant);
+	                  });
 
-	        return participants;
-	      });
-	    }
+	                  return participants;
+	                }));
+
+	              case 1:
+	              case "end":
+	                return _context3.stop();
+	            }
+	          }
+	        }, _callee3, this);
+	      }));
+
+	      function getParticipants() {
+	        return _getParticipants.apply(this, arguments);
+	      }
+
+	      return getParticipants;
+	    }()
 	    /**
 	     * Get participant by SID from conversation
 	     * @returns {Promise<Participant>}
@@ -35346,14 +35395,14 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "getParticipantBySid",
 	    value: function () {
-	      var _getParticipantBySid = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee3(participantSid) {
+	      var _getParticipantBySid = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee4(participantSid) {
 	        var _this5 = this;
 
-	        return _regeneratorRuntime$1.wrap(function _callee3$(_context3) {
+	        return _regeneratorRuntime$1.wrap(function _callee4$(_context4) {
 	          while (1) {
-	            switch (_context3.prev = _context3.next) {
+	            switch (_context4.prev = _context4.next) {
 	              case 0:
-	                return _context3.abrupt("return", this.rosterEntityPromise.then(function () {
+	                return _context4.abrupt("return", this.rosterEntityPromise.then(function () {
 	                  var participant = _this5.participants.get(participantSid);
 
 	                  if (!participant) {
@@ -35365,10 +35414,10 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 1:
 	              case "end":
-	                return _context3.stop();
+	                return _context4.stop();
 	            }
 	          }
-	        }, _callee3, this);
+	        }, _callee4, this);
 	      }));
 
 	      function getParticipantBySid(_x3) {
@@ -35385,16 +35434,16 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "getParticipantByIdentity",
 	    value: function () {
-	      var _getParticipantByIdentity = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee4(identity) {
+	      var _getParticipantByIdentity = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(identity) {
 	        var _this6 = this;
 
 	        var foundParticipant;
-	        return _regeneratorRuntime$1.wrap(function _callee4$(_context4) {
+	        return _regeneratorRuntime$1.wrap(function _callee5$(_context5) {
 	          while (1) {
-	            switch (_context4.prev = _context4.next) {
+	            switch (_context5.prev = _context5.next) {
 	              case 0:
 	                foundParticipant = null;
-	                return _context4.abrupt("return", this.rosterEntityPromise.then(function () {
+	                return _context5.abrupt("return", this.rosterEntityPromise.then(function () {
 	                  _this6.participants.forEach(function (participant) {
 	                    if (participant.identity === identity) {
 	                      foundParticipant = participant;
@@ -35410,10 +35459,10 @@ this.Twilio.Conversations = (function (exports) {
 
 	              case 2:
 	              case "end":
-	                return _context4.stop();
+	                return _context5.stop();
 	            }
 	          }
-	        }, _callee4, this);
+	        }, _callee5, this);
 	      }));
 
 	      function getParticipantByIdentity(_x4) {
@@ -35430,26 +35479,26 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "add",
 	    value: function () {
-	      var _add = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(identity, attributes) {
-	        return _regeneratorRuntime$1.wrap(function _callee5$(_context5) {
+	      var _add = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee6(identity, attributes) {
+	        return _regeneratorRuntime$1.wrap(function _callee6$(_context6) {
 	          while (1) {
-	            switch (_context5.prev = _context5.next) {
+	            switch (_context6.prev = _context6.next) {
 	              case 0:
-	                _context5.next = 2;
+	                _context6.next = 2;
 	                return this.services.commandExecutor.mutateResource('post', this.links.participants, {
 	                  identity: identity,
 	                  attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
 	                });
 
 	              case 2:
-	                return _context5.abrupt("return", _context5.sent);
+	                return _context6.abrupt("return", _context6.sent);
 
 	              case 3:
 	              case "end":
-	                return _context5.stop();
+	                return _context6.stop();
 	            }
 	          }
-	        }, _callee5, this);
+	        }, _callee6, this);
 	      }));
 
 	      function add(_x5, _x6) {
@@ -35464,17 +35513,24 @@ this.Twilio.Conversations = (function (exports) {
 	     * @param proxyAddress
 	     * @param address
 	     * @param attributes
+	     * @param bindingOptions
 	     * @returns {Promise<any>}
 	     */
 
 	  }, {
 	    key: "addNonChatParticipant",
-	    value: function addNonChatParticipant(proxyAddress, address, attributes) {
+	    value: function addNonChatParticipant(proxyAddress, address) {
+	      var _bindingOptions$email, _bindingOptions$email2;
+
+	      var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+	      var bindingOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
 	      return this.services.commandExecutor.mutateResource('post', this.links.participants, {
 	        attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined,
 	        messaging_binding: {
 	          address: address,
-	          proxy_address: proxyAddress
+	          proxy_address: proxyAddress,
+	          name: bindingOptions === null || bindingOptions === void 0 ? void 0 : (_bindingOptions$email = bindingOptions.email) === null || _bindingOptions$email === void 0 ? void 0 : _bindingOptions$email.name,
+	          level: bindingOptions === null || bindingOptions === void 0 ? void 0 : (_bindingOptions$email2 = bindingOptions.email) === null || _bindingOptions$email2 === void 0 ? void 0 : _bindingOptions$email2.level
 	        }
 	      });
 	    }
@@ -36222,7 +36278,7 @@ this.Twilio.Conversations = (function (exports) {
 	      return this.state.attributes;
 	    }
 	    /**
-	     * Push notification type of the message.
+	     * Type of the message.
 	     */
 
 	  }, {
@@ -36231,7 +36287,7 @@ this.Twilio.Conversations = (function (exports) {
 	      return this.state.type;
 	    }
 	    /**
-	     * One of the attached media.
+	     * One of the attached media (if present).
 	     * @deprecated Use attachedMedia instead. Note that the latter is now an array.
 	     */
 
@@ -36283,6 +36339,38 @@ this.Twilio.Conversations = (function (exports) {
 	        return categories.includes(m.category);
 	      });
 	    }
+	    /**
+	     * Get a media descriptor for an email body attachment of a provided type.
+	     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedMimeTypes array.
+	     * @param type Type of email body to request, defaults to `text/plain`.
+	     */
+
+	  }, {
+	    key: "getEmailBody",
+	    value: function getEmailBody() {
+	      var _this$getMediaByCateg, _this$getMediaByCateg2;
+
+	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'text/plain';
+	      return (_this$getMediaByCateg = (_this$getMediaByCateg2 = this.getMediaByCategory(['body'])) === null || _this$getMediaByCateg2 === void 0 ? void 0 : _this$getMediaByCateg2.filter(function (m) {
+	        return m.contentType == type;
+	      }).shift()) !== null && _this$getMediaByCateg !== void 0 ? _this$getMediaByCateg : null;
+	    }
+	    /**
+	     * Get a media descriptor for an email history attachment of a provided type.
+	     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedMimeTypes array.
+	     * @param type Type of email history to request, defaults to `text/plain`.
+	     */
+
+	  }, {
+	    key: "getEmailHistory",
+	    value: function getEmailHistory() {
+	      var _this$getMediaByCateg3, _this$getMediaByCateg4;
+
+	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'text/plain';
+	      return (_this$getMediaByCateg3 = (_this$getMediaByCateg4 = this.getMediaByCategory(['history'])) === null || _this$getMediaByCateg4 === void 0 ? void 0 : _this$getMediaByCateg4.filter(function (m) {
+	        return m.contentType == type;
+	      }).shift()) !== null && _this$getMediaByCateg3 !== void 0 ? _this$getMediaByCateg3 : null;
+	    }
 	  }, {
 	    key: "_update",
 	    value: function _update(data) {
@@ -36696,14 +36784,18 @@ this.Twilio.Conversations = (function (exports) {
 
 	_defineProperty$3(Message, "updated", 'updated');
 
+	__decorate$1([validateTypes_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Media)], Message.prototype, "getEmailBody", null);
+
+	__decorate$1([validateTypes_1(nonEmptyString_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Media)], Message.prototype, "getEmailHistory", null);
+
 	__decorate$1([validateTypesAsync_1('string'), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], Message.prototype, "updateBody", null);
 
-	__decorate$1([validateTypesAsync_1(['string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
+	__decorate$1([validateTypesAsync_1(attributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Message.prototype, "updateAttributes", null);
 
 	__decorate$1([validateTypesAsync_1(custom_1(function (value) {
 	  return [value instanceof Array && value.length > 0 && value.reduce(function (a, c) {
 	    return a && c instanceof Media;
-	  }), 'a non-empty array of Media'];
+	  }, true), 'a non-empty array of Media'];
 	})), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Array]), __metadata$1("design:returntype", Promise)], Message.prototype, "attachTemporaryUrlsFor", null);
 
 	function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -36888,7 +36980,7 @@ this.Twilio.Conversations = (function (exports) {
 	    /**
 	     * Send Message to the conversation, message could include both text and multiple media attachments.
 	     * @param message Message to post
-	     * @returns Returns promise which can fail
+	     * @returns Returns a promise which can fail
 	     */
 
 	  }, {
@@ -37361,6 +37453,8 @@ this.Twilio.Conversations = (function (exports) {
 
 	    this.limits = limits;
 	    this.message = new UnsentMessage(messagesEntity);
+	    this.emailBodies = new Map();
+	    this.emailHistories = new Map();
 	  }
 	  /**
 	   * Sets the message body.
@@ -37396,6 +37490,30 @@ this.Twilio.Conversations = (function (exports) {
 	      this.message.attributes = attributes;
 	      return this;
 	    }
+	    /**
+	     * Set email body with given MIME-type.
+	     * @param mimeType Format of the body to set (text/plain or text/html).
+	     * @param body Body payload in selected format.
+	     */
+
+	  }, {
+	    key: "setEmailBody",
+	    value: function setEmailBody(mimeType, body) {
+	      this.emailBodies.set(mimeType, body);
+	      return this;
+	    }
+	    /**
+	     * Set email history with given MIME-type.
+	     * @param mimeType Format of the history to set (text/plain or text/html).
+	     * @param history History payload in selected format.
+	     */
+
+	  }, {
+	    key: "setEmailHistory",
+	    value: function setEmailHistory(mimeType, history) {
+	      this.emailHistories.set(mimeType, history);
+	      return this;
+	    }
 	    /**
 	     * Adds media to the message.
 	     * @param payload Media to add.
@@ -37404,6 +37522,18 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "addMedia",
 	    value: function addMedia(payload) {
+	      if (typeof FormData === 'undefined' && payload instanceof FormData) {
+	        throw new Error('Could not add FormData content whilst not in a browser');
+	      }
+
+	      if (!(payload instanceof FormData)) {
+	        var mediaOptions = payload;
+
+	        if (!mediaOptions.contentType || !mediaOptions.media) {
+	          throw new Error('Media content in SendMediaOptions must contain non-empty contentType and media');
+	        }
+	      }
+
 	      this.message.mediaContent.push(['media', payload]);
 	      return this;
 	    }
@@ -37414,11 +37544,39 @@ this.Twilio.Conversations = (function (exports) {
 	  }, {
 	    key: "build",
 	    value: function build() {
+	      var _this = this;
+
+	      this.emailBodies.forEach(function (_, key) {
+	        if (!_this.limits.emailBodiesAllowedMimeTypes.includes(key)) {
+	          throw new Error("Unsupported email body MIME type ".concat(key));
+	        }
+	      });
+	      this.emailHistories.forEach(function (_, key) {
+	        if (!_this.limits.emailHistoriesAllowedMimeTypes.includes(key)) {
+	          throw new Error("Unsupported email history MIME type ".concat(key));
+	        }
+	      });
+
+	      if (this.emailBodies.size > this.limits.emailBodiesAllowedMimeTypes.length) {
+	        throw new Error("Too many email bodies attached to the message (".concat(this.emailBodies.size, " > ").concat(this.limits.emailBodiesAllowedMimeTypes.length, ")"));
+	      }
+
+	      if (this.emailHistories.size > this.limits.emailHistoriesAllowedMimeTypes.length) {
+	        throw new Error("Too many email histories attached to the message (".concat(this.emailHistories.size, " > ").concat(this.limits.emailHistoriesAllowedMimeTypes.length, ")"));
+	      }
+
 	      if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {
 	        throw new Error("Too many media attachments in the message (".concat(this.message.mediaContent.length, " > ").concat(this.limits.mediaAttachmentsCountLimit, ")"));
 	      } // @todo we don't know the sizes of the attachments in FormData
+	      // @todo insertion below makes build() method non-repeatable - probably move to UnsentMessage.send() or even sendV2()?
 
 
+	      this.emailBodies.forEach(function (body) {
+	        _this.message.mediaContent.push(['body', body]);
+	      });
+	      this.emailHistories.forEach(function (history) {
+	        _this.message.mediaContent.push(['history', history]);
+	      });
 	      return this.message;
 	    }
 	  }, {
@@ -37457,7 +37615,8 @@ this.Twilio.Conversations = (function (exports) {
 	  sid: 'sid',
 	  status: 'status',
 	  uniqueName: 'uniqueName',
-	  state: 'state'
+	  state: 'state',
+	  bindings: 'bindings'
 	};
 
 	function parseTime(timeString) {
@@ -37485,6 +37644,8 @@ this.Twilio.Conversations = (function (exports) {
 	   * @internal
 	   */
 	  function Conversation(descriptor, sid, links, configuration, services) {
+	    var _descriptor$bindings;
+
 	    var _this;
 
 	    _classCallCheck$4(this, Conversation);
@@ -37517,7 +37678,8 @@ this.Twilio.Conversations = (function (exports) {
 	      dateCreated: dateCreated,
 	      dateUpdated: dateUpdated,
 	      friendlyName: friendlyName,
-	      lastReadMessageIndex: lastReadMessageIndex
+	      lastReadMessageIndex: lastReadMessageIndex,
+	      bindings: (_descriptor$bindings = descriptor.bindings) !== null && _descriptor$bindings !== void 0 ? _descriptor$bindings : {}
 	    };
 
 	    if (descriptor.notificationLevel) {
@@ -37651,6 +37813,11 @@ this.Twilio.Conversations = (function (exports) {
 	    get: function get() {
 	      return this.channelState.notificationLevel;
 	    }
+	  }, {
+	    key: "bindings",
+	    get: function get() {
+	      return this.channelState.bindings;
+	    }
 	  }, {
 	    key: "limits",
 	    get: function get() {
@@ -37940,6 +38107,15 @@ this.Twilio.Conversations = (function (exports) {
 	            updateReasons.add(localKey);
 	            break;
 
+	          case fieldMappings.bindings:
+	            if (isEqual(this.channelState.bindings, update.bindings)) {
+	              break;
+	            }
+
+	            this.channelState.bindings = update.bindings;
+	            updateReasons.add(localKey);
+	            break;
+
 	          default:
 	            var isDate = update[key] instanceof Date;
 	            var keysMatchAsDates = isDate && ((_this$channelState$lo = this.channelState[localKey]) === null || _this$channelState$lo === void 0 ? void 0 : _this$channelState$lo.getTime()) === update[key].getTime();
@@ -38035,7 +38211,7 @@ this.Twilio.Conversations = (function (exports) {
 	          while (1) {
 	            switch (_context4.prev = _context4.next) {
 	              case 0:
-	                return _context4.abrupt("return", this.participantsEntity.add(identity, attributes));
+	                return _context4.abrupt("return", this.participantsEntity.add(identity, attributes !== null && attributes !== void 0 ? attributes : {}));
 
 	              case 1:
 	              case "end":
@@ -38056,19 +38232,25 @@ this.Twilio.Conversations = (function (exports) {
 	     * @param proxyAddress Proxy (Twilio) address of the participant.
 	     * @param address User address of the participant.
 	     * @param attributes Attributes to be attached to the participant.
+	     * @param bindingOptions Options for adding email participants - name and CC/To level.
 	     */
 
 	  }, {
 	    key: "addNonChatParticipant",
 	    value: function () {
-	      var _addNonChatParticipant = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(proxyAddress, address, attributes) {
+	      var _addNonChatParticipant = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1.mark(function _callee5(proxyAddress, address) {
+	        var attributes,
+	            bindingOptions,
+	            _args5 = arguments;
 	        return _regeneratorRuntime$1.wrap(function _callee5$(_context5) {
 	          while (1) {
 	            switch (_context5.prev = _context5.next) {
 	              case 0:
-	                return _context5.abrupt("return", this.participantsEntity.addNonChatParticipant(proxyAddress, address, attributes));
+	                attributes = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : {};
+	                bindingOptions = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : {};
+	                return _context5.abrupt("return", this.participantsEntity.addNonChatParticipant(proxyAddress, address, attributes !== null && attributes !== void 0 ? attributes : {}, bindingOptions !== null && bindingOptions !== void 0 ? bindingOptions : {}));
 
-	              case 1:
+	              case 3:
 	              case "end":
 	                return _context5.stop();
 	            }
@@ -38076,7 +38258,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee5, this);
 	      }));
 
-	      function addNonChatParticipant(_x4, _x5, _x6) {
+	      function addNonChatParticipant(_x4, _x5) {
 	        return _addNonChatParticipant.apply(this, arguments);
 	      }
 
@@ -38128,7 +38310,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee6, this);
 	      }));
 
-	      function advanceLastReadMessageIndex(_x7) {
+	      function advanceLastReadMessageIndex(_x6) {
 	        return _advanceLastReadMessageIndex.apply(this, arguments);
 	      }
 
@@ -38229,7 +38411,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee9, this);
 	      }));
 
-	      function getMessages(_x8, _x9, _x10) {
+	      function getMessages(_x7, _x8, _x9) {
 	        return _getMessages.apply(this, arguments);
 	      }
 
@@ -38332,7 +38514,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee12, this);
 	      }));
 
-	      function getParticipantBySid(_x11) {
+	      function getParticipantBySid(_x10) {
 	        return _getParticipantBySid.apply(this, arguments);
 	      }
 
@@ -38361,7 +38543,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee13, this);
 	      }));
 
-	      function getParticipantByIdentity(_x12) {
+	      function getParticipantByIdentity(_x11) {
 	        return _getParticipantByIdentity.apply(this, arguments);
 	      }
 
@@ -38571,7 +38753,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee18, this);
 	      }));
 
-	      function removeParticipant(_x13) {
+	      function removeParticipant(_x12) {
 	        return _removeParticipant.apply(this, arguments);
 	      }
 
@@ -38624,7 +38806,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee19, this);
 	      }));
 
-	      function sendMessage(_x14, _x15, _x16) {
+	      function sendMessage(_x13, _x14, _x15) {
 	        return _sendMessage.apply(this, arguments);
 	      }
 
@@ -38633,6 +38815,7 @@ this.Twilio.Conversations = (function (exports) {
 	    /**
 	     * New interface to prepare for sending a message.
 	     * Use instead of `sendMessage`.
+	     * @return A MessageBuilder to help set all message sending options.
 	     */
 
 	  }, {
@@ -38751,7 +38934,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee22, this);
 	      }));
 
-	      function setUserNotificationLevel(_x17) {
+	      function setUserNotificationLevel(_x16) {
 	        return _setUserNotificationLevel.apply(this, arguments);
 	      }
 
@@ -38796,7 +38979,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee23, this);
 	      }));
 
-	      function updateAttributes(_x18) {
+	      function updateAttributes(_x17) {
 	        return _updateAttributes.apply(this, arguments);
 	      }
 
@@ -38836,7 +39019,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee24, this);
 	      }));
 
-	      function updateFriendlyName(_x19) {
+	      function updateFriendlyName(_x18) {
 	        return _updateFriendlyName.apply(this, arguments);
 	      }
 
@@ -38871,7 +39054,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee25, this);
 	      }));
 
-	      function updateLastReadMessageIndex(_x20) {
+	      function updateLastReadMessageIndex(_x19) {
 	        return _updateLastReadMessageIndex.apply(this, arguments);
 	      }
 
@@ -38915,7 +39098,7 @@ this.Twilio.Conversations = (function (exports) {
 	        }, _callee26, this);
 	      }));
 
-	      function updateUniqueName(_x21) {
+	      function updateUniqueName(_x20) {
 	        return _updateUniqueName.apply(this, arguments);
 	      }
 
@@ -38987,9 +39170,9 @@ this.Twilio.Conversations = (function (exports) {
 
 	_defineProperty$3(Conversation, "removed", 'removed');
 
-	__decorate$1([validateTypesAsync_1(nonEmptyString_1, ['undefined', 'string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String, Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "add", null);
+	__decorate$1([validateTypesAsync_1(nonEmptyString_1, optionalAttributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String, Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "add", null);
 
-	__decorate$1([validateTypesAsync_1(nonEmptyString_1, nonEmptyString_1, ['undefined', 'string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String, String, Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
+	__decorate$1([validateTypesAsync_1(nonEmptyString_1, nonEmptyString_1, optionalAttributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String, String, Object, Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "addNonChatParticipant", null);
 
 	__decorate$1([validateTypesAsync_1(nonNegativeInteger_1), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Number]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "advanceLastReadMessageIndex", null);
 
@@ -39015,13 +39198,13 @@ this.Twilio.Conversations = (function (exports) {
 
 	    return [isValid, 'a non-empty string, an instance of Buffer or an instance of Blob'];
 	  })
-	})], ['undefined', 'string', 'number', 'boolean', 'object', literal_1(null)], ['undefined', literal_1(null), objectSchema_1('email attributes', {
+	})], optionalAttributesValidator, ['undefined', literal_1(null), objectSchema_1('email attributes', {
 	  subject: [nonEmptyString_1, 'undefined']
 	})]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object, Object, Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "sendMessage", null);
 
 	__decorate$1([validateTypesAsync_1(literal_1('default', 'muted')), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "setUserNotificationLevel", null);
 
-	__decorate$1([validateTypesAsync_1(['string', 'number', 'boolean', 'object', literal_1(null)]), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
+	__decorate$1([validateTypesAsync_1(attributesValidator), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [Object]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "updateAttributes", null);
 
 	__decorate$1([validateTypesAsync_1(['string']), __metadata$1("design:type", Function), __metadata$1("design:paramtypes", [String]), __metadata$1("design:returntype", Promise)], Conversation.prototype, "updateFriendlyName", null);
 
@@ -40302,7 +40485,7 @@ this.Twilio.Conversations = (function (exports) {
 	  this.data = data.data || {};
 	};
 
-	var version = "2.0.1-rc.9";
+	var version = "2.1.0-rc.0";
 
 	function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }