leoric 2.13.5 → 2.13.7

package/dist/adapters/sequelize.d.ts

@@ -28,6 +28,10 @@ interface SequelizeInstanceUpdateOptions<T extends SequelizeBone> extends QueryO
   fields?: Array<[keyof Extract<CommonValues<T>, Literal>] | string | Raw> | [keyof Extract<CommonValues<T>, Literal>];
 }
 
+interface CountSequelizeOptions<T extends typeof SequelizeBone> extends BaseSequelizeConditions<T> {
+  col?: BoneColumns<T> | Raw | '*';
+}
+
 interface SequelizeConditions<T extends typeof SequelizeBone> extends BaseSequelizeConditions<T> {
   group?: BoneColumns<T> | BoneColumns<T>[] | Raw | string;
   having?: WhereConditions<T> | string | { [key:string]: Literal | Literal[] } | Raw;
@@ -117,7 +121,7 @@ export class SequelizeBone extends AbstractBone {
    */
   static bulkBuild<T extends typeof SequelizeBone>(this:T, valueSets: Array<BoneCreateValues<T>>, options?: BoneOptions): Array<InstanceType<T>>;
 
-  static count<T extends typeof SequelizeBone>(this: T, conditions?: SequelizeConditions<T>): Spell<T, ResultSet<T> | number>;
+  static count<T extends typeof SequelizeBone>(this: T, conditions?: CountSequelizeOptions<T>): Spell<T, ResultSet<T> | number>;
   static count<T extends typeof SequelizeBone>(this: T, name?: BoneColumns<T>): Spell<T, ResultSet<T> | number>;
   static count<T extends typeof SequelizeBone>(this: T, name?: Raw | '*'): Spell<T, ResultSet<T> | number>;
 

package/dist/adapters/sequelize.js

@@ -35,8 +35,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -359,14 +359,14 @@ module.exports = function sequelize(Bone) {
              * @param {function|object|array} name
              */
             Spine.setScope = function (name) {
-                var _a;
+                var _b;
                 var args = [];
                 for (var _i = 1; _i < arguments.length; _i++) {
                     args[_i - 1] = arguments[_i];
                 }
                 if (name && this._scopes[name]) {
                     if (this._scopes[name].__isFunc) {
-                        this._scope = parseScope((_a = this._scopes[name]).call.apply(_a, __spreadArray([this], __read(args), false)));
+                        this._scope = parseScope((_b = this._scopes[name]).call.apply(_b, __spreadArray([this], __read(args), false)));
                     }
                     else {
                         this._scope = this._scopes[name];
@@ -385,7 +385,7 @@ module.exports = function sequelize(Bone) {
                 if (descriptors === void 0) { descriptors = {}; }
                 _super.init.call(this, attributes, opts, descriptors);
                 // sequelize opts.getterMethods | setterMethods
-                var _a = opts.getterMethods, getterMethods = _a === void 0 ? {} : _a, _b = opts.setterMethods, setterMethods = _b === void 0 ? {} : _b, defaultScope = opts.defaultScope, scopes = opts.scopes;
+                var _b = opts.getterMethods, getterMethods = _b === void 0 ? {} : _b, _c = opts.setterMethods, setterMethods = _c === void 0 ? {} : _c, defaultScope = opts.defaultScope, scopes = opts.scopes;
                 var setProp = function (obj, type) { return function (result) {
                     Object.keys(obj).map(function (key) {
                         if (!result[key]) {
@@ -478,7 +478,7 @@ module.exports = function sequelize(Bone) {
             // EXISTS
             // static async create(props) {}
             Spine.decrement = function (fields, options) {
-                var e_4, _a;
+                var e_4, _b;
                 var where = options.where, paranoid = options.paranoid;
                 var spell = _super.update.call(this, where, {}, options);
                 if (Array.isArray(fields)) {
@@ -491,7 +491,7 @@ module.exports = function sequelize(Bone) {
                     catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
+                            if (fields_1_1 && !fields_1_1.done && (_b = fields_1.return)) _b.call(fields_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                     }
@@ -512,12 +512,12 @@ module.exports = function sequelize(Bone) {
             };
             // EXISTS
             // static async describe() {}
-            Spine.destroy = function (options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.destroy = function () {
+                return __awaiter(this, arguments, void 0, function (options) {
                     var where, individualHooks, paranoid, findSpell, instances;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 where = options.where, individualHooks = options.individualHooks, paranoid = options.paranoid;
                                 if (!individualHooks) return [3 /*break*/, 4];
@@ -526,13 +526,13 @@ module.exports = function sequelize(Bone) {
                                     findSpell = findSpell.unparanoid;
                                 return [4 /*yield*/, findSpell];
                             case 1:
-                                instances = _a.sent();
+                                instances = _b.sent();
                                 if (!instances.length) return [3 /*break*/, 3];
                                 return [4 /*yield*/, Promise.all(instances.map(function (instance) { return instance.destroy(options); }))];
-                            case 2: return [2 /*return*/, _a.sent()];
+                            case 2: return [2 /*return*/, _b.sent()];
                             case 3: return [3 /*break*/, 6];
                             case 4: return [4 /*yield*/, this.bulkDestroy(options)];
-                            case 5: return [2 /*return*/, _a.sent()];
+                            case 5: return [2 /*return*/, _b.sent()];
                             case 6: return [2 /*return*/];
                         }
                     });
@@ -562,12 +562,12 @@ module.exports = function sequelize(Bone) {
                 if (options === void 0) { options = {}; }
                 return this.findOne(options);
             };
-            Spine.findAndCountAll = function (options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
-                    var spell, spellCount, _a, rows, count;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+            Spine.findAndCountAll = function () {
+                return __awaiter(this, arguments, void 0, function (options) {
+                    var spell, spellCount, _b, rows, count;
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 spell = this._find({}, filterOptions(options));
                                 translateOptions(spell, options);
@@ -582,45 +582,45 @@ module.exports = function sequelize(Bone) {
                                 }
                                 return [4 /*yield*/, Promise.all([spell, spellCount.count()])];
                             case 1:
-                                _a = __read.apply(void 0, [_b.sent(), 2]), rows = _a[0], count = _a[1];
+                                _b = __read.apply(void 0, [_c.sent(), 2]), rows = _b[0], count = _b[1];
                                 return [2 /*return*/, { rows: rows, count: count }];
                         }
                     });
                 });
             };
             Spine.findByPk = function (value, options) {
-                var _a;
+                var _b;
                 if (options === void 0) { options = {}; }
-                var spell = _super.findOne.call(this, (_a = {}, _a[this.primaryKey] = value, _a), options);
+                var spell = _super.findOne.call(this, (_b = {}, _b[this.primaryKey] = value, _b), options);
                 translateOptions(spell, options);
                 if (options.paranoid === false)
                     spell = spell.unparanoid;
                 return spell;
             };
-            Spine.findCreateFind = function (options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.findCreateFind = function () {
+                return __awaiter(this, arguments, void 0, function (options) {
                     var where, defaults, instance, err_1;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 where = options.where, defaults = options.defaults;
                                 return [4 /*yield*/, this.findOne(options)];
                             case 1:
-                                instance = _a.sent();
+                                instance = _b.sent();
                                 if (!!instance) return [3 /*break*/, 6];
-                                _a.label = 2;
+                                _b.label = 2;
                             case 2:
-                                _a.trys.push([2, 4, , 6]);
+                                _b.trys.push([2, 4, , 6]);
                                 return [4 /*yield*/, this.create(__assign(__assign({}, defaults), where), options)];
                             case 3:
-                                instance = _a.sent();
+                                instance = _b.sent();
                                 return [3 /*break*/, 6];
                             case 4:
-                                err_1 = _a.sent();
+                                err_1 = _b.sent();
                                 return [4 /*yield*/, this.findOne(options)];
                             case 5:
-                                instance = _a.sent();
+                                instance = _b.sent();
                                 return [3 /*break*/, 6];
                             case 6: return [2 /*return*/, instance];
                         }
@@ -648,17 +648,17 @@ module.exports = function sequelize(Bone) {
                     return spell.unparanoid;
                 return spell;
             };
-            Spine.findOrBuild = function (options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.findOrBuild = function () {
+                return __awaiter(this, arguments, void 0, function (options) {
                     var where, defaults, validate, instance, result;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 where = options.where, defaults = options.defaults, validate = options.validate;
                                 return [4 /*yield*/, this.findOne(options)];
                             case 1:
-                                instance = _a.sent();
+                                instance = _b.sent();
                                 result = instance || this.build(__assign(__assign({}, defaults), where), { validate: validate });
                                 return [2 /*return*/, [result, !instance]];
                         }
@@ -667,17 +667,17 @@ module.exports = function sequelize(Bone) {
             };
             Spine.findOrCreate = function (options) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _a, result, built;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    var _b, result, built;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0: return [4 /*yield*/, this.findOrBuild(options)];
                             case 1:
-                                _a = __read.apply(void 0, [_b.sent(), 2]), result = _a[0], built = _a[1];
+                                _b = __read.apply(void 0, [_c.sent(), 2]), result = _b[0], built = _b[1];
                                 if (!built) return [3 /*break*/, 3];
                                 return [4 /*yield*/, result.save()];
                             case 2:
-                                _b.sent();
-                                _b.label = 3;
+                                _c.sent();
+                                _c.label = 3;
                             case 3: return [2 /*return*/, [result, built]];
                         }
                     });
@@ -691,7 +691,7 @@ module.exports = function sequelize(Bone) {
             // BREAKING
             // static hasOne() {}
             Spine.increment = function (fields, options) {
-                var e_5, _a;
+                var e_5, _b;
                 if (options === void 0) { options = {}; }
                 var where = options.where, paranoid = options.paranoid;
                 // pass options to update
@@ -706,7 +706,7 @@ module.exports = function sequelize(Bone) {
                     catch (e_5_1) { e_5 = { error: e_5_1 }; }
                     finally {
                         try {
-                            if (fields_2_1 && !fields_2_1.done && (_a = fields_2.return)) _a.call(fields_2);
+                            if (fields_2_1 && !fields_2_1.done && (_b = fields_2.return)) _b.call(fields_2);
                         }
                         finally { if (e_5) throw e_5.error; }
                     }
@@ -725,40 +725,40 @@ module.exports = function sequelize(Bone) {
                     return spell.unparanoid;
                 return spell;
             };
-            Spine.max = function (attribute, options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.max = function (attribute_1) {
+                return __awaiter(this, arguments, void 0, function (attribute, options) {
                     var spell;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 spell = _super._find.call(this, options.where, filterOptions(options)).$maximum(attribute);
                                 if (options.paranoid === false)
                                     spell = spell.unparanoid;
                                 return [4 /*yield*/, spell];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 1: return [2 /*return*/, _b.sent()];
                         }
                     });
                 });
             };
-            Spine.min = function (attribute, options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.min = function (attribute_1) {
+                return __awaiter(this, arguments, void 0, function (attribute, options) {
                     var spell;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 spell = _super._find.call(this, options.where, filterOptions(options)).$minimum(attribute);
                                 if (options.paranoid === false)
                                     spell = spell.unparanoid;
                                 return [4 /*yield*/, spell];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 1: return [2 /*return*/, _b.sent()];
                         }
                     });
                 });
             };
             Spine.removeAttribute = function (name) {
-                var _a = this, attributes = _a.attributes, attributeMap = _a.attributeMap;
+                var _b = this, attributes = _b.attributes, attributeMap = _b.attributeMap;
                 var columnInfo = attributes[name];
                 delete attributes[name];
                 delete attributeMap[columnInfo.columnName];
@@ -770,18 +770,18 @@ module.exports = function sequelize(Bone) {
             Spine.schema = function () {
                 throw new Error('unimplemented');
             };
-            Spine.sum = function (attribute, options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.sum = function (attribute_1) {
+                return __awaiter(this, arguments, void 0, function (attribute, options) {
                     var spell;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 spell = _super.find.call(this, options.where, filterOptions(options)).$sum(attribute);
                                 if (options.paranoid === false)
                                     spell = spell.unparanoid;
                                 return [4 /*yield*/, spell];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 1: return [2 /*return*/, _b.sent()];
                         }
                     });
                 });
@@ -790,12 +790,12 @@ module.exports = function sequelize(Bone) {
             // static async sync() {}
             // EXISTS
             // static async truncate() {}
-            Spine.update = function (values, options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.update = function (values_1) {
+                return __awaiter(this, arguments, void 0, function (values, options) {
                     var where, paranoid, individualHooks, findSpell, instances;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 where = options.where, paranoid = options.paranoid, individualHooks = options.individualHooks;
                                 if (!individualHooks) return [3 /*break*/, 4];
@@ -805,10 +805,10 @@ module.exports = function sequelize(Bone) {
                                     findSpell = findSpell.unparanoid;
                                 return [4 /*yield*/, findSpell];
                             case 1:
-                                instances = _a.sent();
+                                instances = _b.sent();
                                 if (!instances.length) return [3 /*break*/, 3];
                                 return [4 /*yield*/, Promise.all(instances.map(function (instance) { return instance.update(values, options); }))];
-                            case 2: return [2 /*return*/, _a.sent()];
+                            case 2: return [2 /*return*/, _b.sent()];
                             case 3: return [3 /*break*/, 5];
                             case 4: return [2 /*return*/, this.bulkUpdate(values, options)];
                             case 5: return [2 /*return*/];
@@ -819,7 +819,7 @@ module.exports = function sequelize(Bone) {
             // proxy to class.update({ individualHooks=false }) see https://github.com/sequelize/sequelize/blob/4063c2ab627ad57919d5b45cc7755f077a69fa5e/lib/model.js#L3083  before(after)BulkUpdate
             Spine.bulkUpdate = function (values, options) {
                 if (options === void 0) { options = {}; }
-                var where = options.where, _a = options.paranoid, paranoid = _a === void 0 ? false : _a, validate = options.validate;
+                var where = options.where, _b = options.paranoid, paranoid = _b === void 0 ? false : _b, validate = options.validate;
                 var whereConditions = where || {};
                 var spell = _super.update.call(this, whereConditions, values, __assign({ validate: validate, hooks: false }, options));
                 var transOptions = __assign({}, options);
@@ -833,17 +833,17 @@ module.exports = function sequelize(Bone) {
             // static upsert(values, options)
             // EXISTS
             // get isNewRecord() {}
-            Spine.prototype.update = function (values, options) {
-                if (values === void 0) { values = {}; }
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
-                    var _a, fields, changeValues, originalValues, name, changedKeys, changedKeys_1, changedKeys_1_1, name, changes, res, err_2;
-                    var e_6, _b;
+            Spine.prototype.update = function () {
+                return __awaiter(this, arguments, void 0, function (values, options) {
+                    var _b, fields, changeValues, originalValues, name, changedKeys, changedKeys_1, changedKeys_1_1, name, changes, res, err_2;
+                    var e_6, _c;
                     var _this = this;
-                    return __generator(this, function (_c) {
-                        switch (_c.label) {
+                    if (values === void 0) { values = {}; }
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
                             case 0:
-                                _a = options.fields, fields = _a === void 0 ? [] : _a;
+                                _b = options.fields, fields = _b === void 0 ? [] : _b;
                                 changeValues = {};
                                 originalValues = Object.assign({}, this.getRaw());
                                 for (name in values) {
@@ -866,7 +866,7 @@ module.exports = function sequelize(Bone) {
                                     catch (e_6_1) { e_6 = { error: e_6_1 }; }
                                     finally {
                                         try {
-                                            if (changedKeys_1_1 && !changedKeys_1_1.done && (_b = changedKeys_1.return)) _b.call(changedKeys_1);
+                                            if (changedKeys_1_1 && !changedKeys_1_1.done && (_c = changedKeys_1.return)) _c.call(changedKeys_1);
                                         }
                                         finally { if (e_6) throw e_6.error; }
                                     }
@@ -887,15 +887,15 @@ module.exports = function sequelize(Bone) {
                                 }
                                 // instance update don't need to be paranoid
                                 options.paranoid = false;
-                                _c.label = 1;
+                                _d.label = 1;
                             case 1:
-                                _c.trys.push([1, 3, , 4]);
+                                _d.trys.push([1, 3, , 4]);
                                 return [4 /*yield*/, _super.prototype._update.call(this, changes, options)];
                             case 2:
-                                res = _c.sent();
+                                res = _d.sent();
                                 return [2 /*return*/, res];
                             case 3:
-                                err_2 = _c.sent();
+                                err_2 = _d.sent();
                                 // revert value in case update failed
                                 this._setRaw(originalValues);
                                 throw err_2;
@@ -907,7 +907,7 @@ module.exports = function sequelize(Bone) {
             // EXISTS
             // get isNewRecord() {}
             Spine.prototype.decrement = function (fields, options) {
-                var e_7, _a, _b;
+                var e_7, _b, _c;
                 if (options === void 0) { options = {}; }
                 var Model = this.constructor;
                 var primaryKey = Model.primaryKey;
@@ -929,7 +929,7 @@ module.exports = function sequelize(Bone) {
                         catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
-                                if (fields_3_1 && !fields_3_1.done && (_a = fields_3.return)) _a.call(fields_3);
+                                if (fields_3_1 && !fields_3_1.done && (_b = fields_3.return)) _b.call(fields_3);
                             }
                             finally { if (e_7) throw e_7.error; }
                         }
@@ -951,7 +951,7 @@ module.exports = function sequelize(Bone) {
                     }
                     this._validateAttributes(updateValues);
                 }
-                return Model.decrement(fields, __assign(__assign({}, options), { where: (_b = {}, _b[primaryKey] = this[primaryKey], _b) }));
+                return Model.decrement(fields, __assign(__assign({}, options), { where: (_c = {}, _c[primaryKey] = this[primaryKey], _c) }));
             };
             /**
              *
@@ -959,15 +959,15 @@ module.exports = function sequelize(Bone) {
              * @param {*} [options={}]
              * @returns
              */
-            Spine.prototype.destroy = function (options) {
-                if (options === void 0) { options = {}; }
-                return __awaiter(this, void 0, void 0, function () {
+            Spine.prototype.destroy = function () {
+                return __awaiter(this, arguments, void 0, function (options) {
                     var removeResult;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    if (options === void 0) { options = {}; }
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0: return [4 /*yield*/, this._remove(options.force, __assign({}, options))];
                             case 1:
-                                removeResult = _a.sent();
+                                removeResult = _b.sent();
                                 if (options.force)
                                     return [2 /*return*/, removeResult];
                                 return [2 /*return*/, this];
@@ -998,7 +998,7 @@ module.exports = function sequelize(Bone) {
                 configurable: true
             });
             Spine.prototype.increment = function (fields, options) {
-                var e_8, _a, _b;
+                var e_8, _b, _c;
                 if (options === void 0) { options = {}; }
                 var Model = this.constructor;
                 var primaryKey = Model.primaryKey;
@@ -1020,7 +1020,7 @@ module.exports = function sequelize(Bone) {
                         catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
-                                if (fields_4_1 && !fields_4_1.done && (_a = fields_4.return)) _a.call(fields_4);
+                                if (fields_4_1 && !fields_4_1.done && (_b = fields_4.return)) _b.call(fields_4);
                             }
                             finally { if (e_8) throw e_8.error; }
                         }
@@ -1042,20 +1042,20 @@ module.exports = function sequelize(Bone) {
                     }
                     this._validateAttributes(updateValues);
                 }
-                return Model.increment(fields, __assign(__assign({}, options), { where: (_b = {}, _b[primaryKey] = this[primaryKey], _b) }));
+                return Model.increment(fields, __assign(__assign({}, options), { where: (_c = {}, _c[primaryKey] = this[primaryKey], _c) }));
             };
             Spine.prototype.isSoftDeleted = function () {
                 var deletedAt = this.constructor.timestamps.deletedAt;
                 return this[deletedAt] != null;
             };
             Spine.prototype.previous = function (key) {
-                var e_9, _a;
+                var e_9, _b;
                 if (key != null)
                     return this.getRawPrevious(key);
                 var result = {};
                 try {
-                    for (var _b = __values(Object.keys(this.constructor.attributes)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var attrKey = _c.value;
+                    for (var _c = __values(Object.keys(this.constructor.attributes)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var attrKey = _d.value;
                         var prevValue = this.getRawPrevious(attrKey);
                         if (prevValue !== undefined)
                             result[attrKey] = prevValue;
@@ -1064,7 +1064,7 @@ module.exports = function sequelize(Bone) {
                 catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
                     finally { if (e_9) throw e_9.error; }
                 }
@@ -1090,9 +1090,9 @@ module.exports = function sequelize(Bone) {
             // EXISTS
             // validate() {}
             Spine.prototype.where = function () {
-                var _a;
+                var _b;
                 var primaryKey = this.constructor.primaryKey;
-                return _a = {}, _a[primaryKey] = this[primaryKey], _a;
+                return _b = {}, _b[primaryKey] = this[primaryKey], _b;
             };
             Object.defineProperty(Spine.prototype, "Model", {
                 /**