update @types/sequelize to 4.0.69, downgrade @types/bluebird to 3.5.4, update new v3/Sequelize constructor

Author: kukoo

lib/models/BaseSequelize.ts

@@ -22,10 +22,6 @@ export abstract class BaseSequelize {
   thoughMap: { [through: string]: any } = {};
   _: { [modelName: string]: (typeof Model) } = {};
 
-  static isISequelizeConfig(obj: any): obj is ISequelizeConfig {
-    return obj.hasOwnProperty("database") && obj.hasOwnProperty("username");
-  }
-
   static isISequelizeDbNameConfig(obj: any): obj is ISequelizeDbNameConfig {
     return obj.hasOwnProperty("name") && obj.hasOwnProperty("username");
   }
@@ -54,8 +50,7 @@ export abstract class BaseSequelize {
     }
 
     if (BaseSequelize.isISequelizeDbNameConfig(config)) {
-      // Sequelize uses "database" property as a database name.
-      // @TODO: "name" property is deprecated, use "database" instead
+      // @TODO: deprecate "name" property, use "database" instead
       const database = config.name;
       return {...config, database} as ISequelizeConfig;
     }

lib/models/v3/Sequelize.ts

@@ -1,40 +1,41 @@
 import 'reflect-metadata';
 import * as SequelizeOrigin from 'sequelize';
 import {Model} from "../Model";
-import {ISequelizeConfig} from "../../interfaces/ISequelizeConfig";
+import {SequelizeConfig} from "../../types/SequelizeConfig";
 import {getModelName, getAttributes, getOptions} from "../../services/models";
 import {PROPERTY_LINK_TO_ORIG} from "../../services/models";
 import {BaseSequelize} from "../BaseSequelize";
 import {Table} from "../../annotations/Table";
 import {ISequelizeAssociation} from "../../interfaces/ISequelizeAssociation";
 
-let preparedConfig;
-
 export class Sequelize extends SequelizeOrigin implements BaseSequelize {
 
   // to fix "$1" called with something that's not an instance of Sequelize.Model
   Model: any = Function;
 
   thoughMap: { [through: string]: any } = {};
   _: { [modelName: string]: typeof Model } = {};
-  init: (config: ISequelizeConfig) => void;
+  init: (config: SequelizeConfig) => void;
   addModels: (models: Array<typeof Model> | string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;
 
-  constructor(config: ISequelizeConfig) {
-    // a spread operator would be the more reasonable approach here,
-    // but this is currently not possible due to a bug by ts
-    // https://github.com/Microsoft/TypeScript/issues/4130
-    // TODO@robin probably make the constructor private and
-    // TODO       use a static factory function instead
+  constructor(config: SequelizeConfig | string) {
+
     super(
-      (preparedConfig = BaseSequelize.prepareConfig(config), preparedConfig.name),
-      preparedConfig.username,
-      preparedConfig.password,
-      preparedConfig
+      (typeof config === "string") ?
+        config : // URI string
+        BaseSequelize.isISequelizeUriConfig(config) ?
+          config.uri : // URI string from ISequelizeUriConfig
+          BaseSequelize.prepareConfig(config) // Config object (ISequelizeConfig)
     );
 
-    this.init(config);
+    if (BaseSequelize.isISequelizeUriConfig(config)) {
+      this.options = {...this.options, ...config};
+    }
+
+    if (typeof config !== "string") {
+      this.init(config);
+    }
   }
 
   getThroughModel(through: string): typeof Model {

lib/models/v4/Sequelize.ts

@@ -9,8 +9,8 @@ import {ISequelizeAssociation} from "../../interfaces/ISequelizeAssociation";
 
 export class Sequelize extends OriginSequelize implements BaseSequelize {
 
-  thoughMap: { [through: string]: any } = {};
-  _: { [modelName: string]: typeof Model } = {};
+  thoughMap: {[through: string]: any} = {};
+  _: {[modelName: string]: typeof Model} = {};
   init: (config: SequelizeConfig) => void;
   addModels: (models: Array<typeof Model> | string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;

package-lock.json

@@ -32,10 +32,11 @@
   "dependencies": {
     "@types/node": "6.0.41",
     "@types/reflect-metadata": "0.0.4",
-    "@types/sequelize": "4.0.68",
+    "@types/sequelize": "4.0.69",
     "es6-shim": "0.35.3"
   },
   "devDependencies": {
+    "@types/bluebird": "3.5.4",
     "@types/chai": "3.4.35",
     "@types/chai-as-promised": "0.0.29",
     "@types/chai-datetime": "0.0.30",