nylas 6.3.1 → 6.4.1

package/lib/models/calendar-restful-model-collection.js

@@ -67,8 +67,8 @@ var CalendarRestfulModelCollection = /** @class */ (function (_super) {
                 callback(null, json);
             }
             var freeBusy = [];
-            for (var _i = 0, _a = JSON.parse(json); _i < _a.length; _i++) {
-                var fb = _a[_i];
+            for (var _i = 0, json_1 = json; _i < json_1.length; _i++) {
+                var fb = json_1[_i];
                 freeBusy.push(new free_busy_1.default().fromJSON(fb));
             }
             return Promise.resolve(freeBusy);

package/lib/models/draft.d.ts

@@ -7,6 +7,7 @@ export declare type DraftProperties = MessageProperties & {
     rawMime?: string;
     replyToMessageId?: string;
     version?: number;
+    fileIdsToAttach?: string[];
 };
 export default class Draft extends Message implements DraftProperties {
     rawMime?: string;

package/lib/models/draft.js

@@ -147,6 +147,9 @@ var Draft = /** @class */ (function (_super) {
         }), rawMime: attributes_1.default.String({
             modelKey: 'rawMime',
             readOnly: true,
+        }), fileIdsToAttach: attributes_1.default.StringList({
+            modelKey: 'fileIdsToAttach',
+            readOnly: true,
         }) });
     return Draft;
 }(message_1.default));

package/lib/models/event.d.ts

@@ -23,6 +23,7 @@ export declare type EventProperties = {
     when: WhenProperties;
     iCalUID?: string;
     messageId?: string;
+    eventCollectionId?: string | number;
     title?: string;
     description?: string;
     owner?: string;
@@ -37,8 +38,10 @@ export declare type EventProperties = {
     };
     masterEventId?: string;
     originalStartTime?: number;
+    capacity?: number;
     conferencing?: EventConferencingProperties;
     notifications?: EventNotificationProperties[];
+    roundRobinOrder?: string[];
     metadata?: object;
     jobStatusId?: string;
 };
@@ -47,6 +50,7 @@ export default class Event extends RestfulModel {
     when: When;
     iCalUID?: string;
     messageId?: string;
+    eventCollectionId?: string | number;
     title?: string;
     description?: string;
     owner?: string;
@@ -61,8 +65,10 @@ export default class Event extends RestfulModel {
     };
     masterEventId?: string;
     originalStartTime?: number;
+    capacity?: number;
     conferencing?: EventConferencing;
     notifications?: EventNotification[];
+    roundRobinOrder?: string[];
     metadata?: object;
     jobStatusId?: string;
     static collectionName: string;
@@ -77,4 +83,5 @@ export default class Event extends RestfulModel {
     saveRequestBody(): Record<string, unknown>;
     rsvp(status: string, comment: string, callback?: (error: Error | null, data?: Event) => void): Promise<Event>;
     generateICS(options?: ICSOptions): Promise<string>;
+    private validate;
 }

package/lib/models/event.js

@@ -135,11 +135,7 @@ var Event = /** @class */ (function (_super) {
     };
     Event.prototype.save = function (params, callback) {
         if (params === void 0) { params = {}; }
-        if (this.conferencing &&
-            this.conferencing.details &&
-            this.conferencing.autocreate) {
-            return Promise.reject(new Error("Cannot set both 'details' and 'autocreate' in conferencing object."));
-        }
+        this.validate();
         return _super.prototype.save.call(this, params, callback);
     };
     Event.prototype.saveRequestBody = function () {
@@ -196,6 +192,19 @@ var Event = /** @class */ (function (_super) {
             return response.ics;
         });
     };
+    Event.prototype.validate = function () {
+        if (this.conferencing &&
+            this.conferencing.details &&
+            this.conferencing.autocreate) {
+            throw new Error("Cannot set both 'details' and 'autocreate' in conferencing object.");
+        }
+        if (this.capacity &&
+            this.capacity != -1 &&
+            this.participants &&
+            this.participants.length > this.capacity) {
+            throw new Error('The number of participants in the event exceeds the set capacity.');
+        }
+    };
     Event.collectionName = 'events';
     Event.attributes = __assign(__assign({}, restful_model_1.default.attributes), { calendarId: attributes_1.default.String({
             modelKey: 'calendarId',
@@ -208,6 +217,9 @@ var Event = /** @class */ (function (_super) {
             modelKey: 'messageId',
             jsonKey: 'message_id',
             readOnly: true,
+        }), eventCollectionId: attributes_1.default.String({
+            modelKey: 'eventCollectionId',
+            jsonKey: 'event_collection_id',
         }), title: attributes_1.default.String({
             modelKey: 'title',
         }), description: attributes_1.default.String({
@@ -241,12 +253,17 @@ var Event = /** @class */ (function (_super) {
             modelKey: 'originalStartTime',
             jsonKey: 'original_start_time',
             readOnly: true,
+        }), capacity: attributes_1.default.Number({
+            modelKey: 'capacity',
         }), conferencing: attributes_1.default.Object({
             modelKey: 'conferencing',
             itemClass: event_conferencing_1.default,
         }), notifications: attributes_1.default.Collection({
             modelKey: 'notifications',
             itemClass: event_notification_1.default,
+        }), roundRobinOrder: attributes_1.default.StringList({
+            modelKey: 'roundRobinOrder',
+            jsonKey: 'round_robin_order',
         }), metadata: attributes_1.default.Object({
             modelKey: 'metadata',
         }), jobStatusId: attributes_1.default.String({

package/lib/models/free-busy.d.ts

@@ -16,11 +16,24 @@ export declare class FreeBusyCalendar extends Model implements FreeBusyCalendarP
     static attributes: Record<string, Attribute>;
     constructor(props?: FreeBusyCalendarProperties);
 }
+export declare type TimeSlotCapacityProperties = {
+    eventId: string;
+    currentCapacity: number;
+    maxCapacity: number;
+};
+export declare class TimeSlotCapacity extends Model implements TimeSlotCapacityProperties {
+    eventId: string;
+    currentCapacity: number;
+    maxCapacity: number;
+    static attributes: Record<string, Attribute>;
+    constructor(props?: TimeSlotCapacityProperties);
+}
 export declare type TimeSlotProperties = {
     status: string;
     startTime: number;
     endTime: number;
     emails?: string[];
+    capacity?: TimeSlotCapacityProperties;
 };
 export declare class TimeSlot extends Model implements TimeSlotProperties {
     object: string;
@@ -28,6 +41,7 @@ export declare class TimeSlot extends Model implements TimeSlotProperties {
     startTime: number;
     endTime: number;
     emails?: string[];
+    capacity?: TimeSlotCapacity;
     static attributes: Record<string, Attribute>;
     constructor(props?: TimeSlotProperties);
 }

package/lib/models/free-busy.js

@@ -40,6 +40,33 @@ var FreeBusyCalendar = /** @class */ (function (_super) {
     return FreeBusyCalendar;
 }(model_1.default));
 exports.FreeBusyCalendar = FreeBusyCalendar;
+var TimeSlotCapacity = /** @class */ (function (_super) {
+    __extends(TimeSlotCapacity, _super);
+    function TimeSlotCapacity(props) {
+        var _this = _super.call(this) || this;
+        _this.eventId = '';
+        _this.currentCapacity = 0;
+        _this.maxCapacity = 0;
+        _this.initAttributes(props);
+        return _this;
+    }
+    TimeSlotCapacity.attributes = {
+        eventId: attributes_1.default.String({
+            modelKey: 'eventId',
+            jsonKey: 'event_id',
+        }),
+        currentCapacity: attributes_1.default.Number({
+            modelKey: 'currentCapacity',
+            jsonKey: 'current_capacity',
+        }),
+        maxCapacity: attributes_1.default.Number({
+            modelKey: 'maxCapacity',
+            jsonKey: 'max_capacity',
+        }),
+    };
+    return TimeSlotCapacity;
+}(model_1.default));
+exports.TimeSlotCapacity = TimeSlotCapacity;
 var TimeSlot = /** @class */ (function (_super) {
     __extends(TimeSlot, _super);
     function TimeSlot(props) {
@@ -69,6 +96,10 @@ var TimeSlot = /** @class */ (function (_super) {
         emails: attributes_1.default.StringList({
             modelKey: 'emails',
         }),
+        capacity: attributes_1.default.Object({
+            modelKey: 'capacity',
+            itemClass: TimeSlotCapacity,
+        }),
     };
     return TimeSlot;
 }(model_1.default));

package/lib/models/model-collection.d.ts

@@ -5,6 +5,7 @@ export default class ModelCollection<T extends Model> {
     connection: NylasConnection;
     modelClass: any;
     _path: string;
+    baseUrl?: string;
     constructor(modelClass: any, connection: NylasConnection, path: string);
     forEach(params: Record<string, unknown> | undefined, eachCallback: (item: T) => void, completeCallback?: (err?: Error | null | undefined) => void): void;
     list(params?: Record<string, unknown>, callback?: (error: Error | null, obj?: T[]) => void): Promise<T[]>;

package/lib/models/model-collection.js

@@ -157,6 +157,7 @@ var ModelCollection = /** @class */ (function () {
                 method: 'GET',
                 path: path,
                 qs: __assign(__assign({}, params), { offset: offset, limit: limit }),
+                baseUrl: this.baseUrl,
             });
         }
         return this.getModelCollection(params, offset, limit, path);
@@ -172,6 +173,7 @@ var ModelCollection = /** @class */ (function () {
             method: 'GET',
             path: this.path() + "/" + id,
             qs: params,
+            baseUrl: this.baseUrl,
         })
             .then(function (json) {
             var model = _this.createModel(json);
@@ -185,6 +187,7 @@ var ModelCollection = /** @class */ (function () {
             method: 'GET',
             path: path,
             qs: __assign(__assign({}, params), { offset: offset, limit: limit }),
+            baseUrl: this.baseUrl,
         })
             .then(function (jsonArray) {
             var models = jsonArray.map(function (json) {

package/lib/models/restful-model-collection.d.ts

@@ -4,7 +4,6 @@ import ModelCollection from './model-collection';
 export declare type GetCallback = (error: Error | null, result?: RestfulModel) => void;
 export default class RestfulModelCollection<T extends RestfulModel> extends ModelCollection<any> {
     modelClass: typeof RestfulModel;
-    baseUrl?: string;
     constructor(modelClass: typeof RestfulModel, connection: NylasConnection);
     count(params?: Record<string, unknown>, callback?: (err: Error | null, num?: number) => void): Promise<number>;
     first(params?: Record<string, unknown>, callback?: (error: Error | null, model?: T) => void): Promise<T>;

package/lib/models/scheduler-restful-model-collection.d.ts

@@ -14,6 +14,7 @@ export declare type ProviderAvailability = {
 export default class SchedulerRestfulModelCollection extends RestfulModelCollection<Scheduler> {
     connection: NylasConnection;
     modelClass: typeof Scheduler;
+    baseUrl: string;
     constructor(connection: NylasConnection);
     getGoogleAvailability(): Promise<ProviderAvailability>;
     getOffice365Availability(): Promise<ProviderAvailability>;

package/lib/models/scheduler.d.ts

@@ -153,6 +153,7 @@ export declare type SchedulerConfigProperties = {
     };
     event?: {
         duration?: number;
+        capacity?: number;
         location?: string;
         title?: string;
     };
@@ -176,6 +177,7 @@ export declare class SchedulerConfig extends Model implements SchedulerConfigPro
     };
     event?: {
         duration?: number;
+        capacity?: number;
         location?: string;
         title?: string;
     };

package/lib/nylas-connection.js

@@ -193,30 +193,22 @@ var NylasConnection = /** @class */ (function () {
                     console.warn(warning);
                 }
                 if (response.status > 299) {
-                    return response
-                        .clone()
-                        .json()
-                        .then(function (body) {
-                        var error = new nylas_api_error_1.default(response.status, body.type, body.message);
-                        if (body.missing_fields) {
-                            error.missingFields = body.missing_fields;
-                        }
-                        if (body.server_error) {
-                            error.serverError = body.server_error;
-                        }
-                        return reject(error);
-                    })
-                        .catch(function () {
-                        return response
-                            .text()
-                            .then(function (text) {
-                            var error = new nylas_api_error_1.default(response.status, response.statusText, text);
+                    return response.text().then(function (body) {
+                        try {
+                            var parsedApiError = JSON.parse(body);
+                            var error = new nylas_api_error_1.default(response.status, parsedApiError.type, parsedApiError.message);
+                            if (parsedApiError.missing_fields) {
+                                error.missingFields = parsedApiError.missing_fields;
+                            }
+                            if (parsedApiError.server_error) {
+                                error.serverError = parsedApiError.server_error;
+                            }
                             return reject(error);
-                        })
-                            .catch(function () {
-                            var error = new nylas_api_error_1.default(response.status, response.statusText, 'Error encountered during request, unable to extract error message.');
+                        }
+                        catch (e) {
+                            var error = new nylas_api_error_1.default(response.status, response.statusText, body);
                             return reject(error);
-                        });
+                        }
                     });
                 }
                 else {
@@ -244,12 +236,14 @@ var NylasConnection = /** @class */ (function () {
                         return resolve(response.text());
                     }
                     else {
-                        return response
-                            .clone()
-                            .json()
-                            .catch(function () { return response.text(); })
-                            .then(function (data) { return resolve(data); })
-                            .catch(function () { return resolve(undefined); });
+                        return response.text().then(function (text) {
+                            try {
+                                return resolve(JSON.parse(text));
+                            }
+                            catch (e) {
+                                return resolve(text);
+                            }
+                        });
                     }
                 }
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nylas",
-  "version": "6.3.1",
+  "version": "6.4.1",
   "description": "A NodeJS wrapper for the Nylas REST API for email, contacts, and calendar.",
   "main": "lib/nylas.js",
   "types": "lib/nylas.d.ts",