key access to added models implemented #17 ; code coverage increased

Author: RobinBuschmann

example/models/Post.ts

@@ -6,7 +6,6 @@ import {Comment} from "./Comment";
 import {PostTopic} from "./PostTopic";
 import {Topic} from "./Topic";
 import {Author} from "./Author";
-import {Length} from "../../lib/annotations/validation/Length";
 
 @Scopes({
   full: {
@@ -48,5 +47,3 @@ export class Post extends Model<Post> {
   author?: Author;
 
 }
-
-Post.beforeCreate(post => {});

lib/models/BaseSequelize.ts

@@ -16,6 +16,7 @@ import {getForeignKey} from "../services/association";
 export abstract class BaseSequelize {
 
   thoughMap: {[through: string]: any} = {};
+  _: {[modelName: string]: (typeof Model)} = {};
 
   static extend(target: any): void {
 
@@ -67,6 +68,7 @@ export abstract class BaseSequelize {
     models.forEach(model => model.isInitialized = true);
     this.associateModels(models);
     resolveScopes(models);
+    models.forEach(model => this._[model.name] = model);
   }
 
   init(config: ISequelizeConfig): void {

lib/models/Sequelize.d.ts

@@ -1,14 +1,16 @@
 /// <reference types="sequelize" />
 import 'reflect-metadata';
 import * as SequelizeOrigin from 'sequelize';
-import { Model } from "./Model";
-import { ISequelizeConfig } from "../interfaces/ISequelizeConfig";
+import {Model} from "./Model";
+import {ISequelizeConfig} from "../interfaces/ISequelizeConfig";
 import {ISequelizeValidationOnlyConfig} from "../interfaces/ISequelizeValidationOnlyConfig";
 
 export declare class Sequelize extends SequelizeOrigin {
 
-    constructor(config: ISequelizeConfig|ISequelizeValidationOnlyConfig);
+  _: {[modelName: string]: (typeof Model)};
 
-    addModels(models: Array<typeof Model>): void;
-    addModels(modelPaths: string[]): void;
+  constructor(config: ISequelizeConfig | ISequelizeValidationOnlyConfig);
+
+  addModels(models: Array<typeof Model>): void;
+  addModels(modelPaths: string[]): void;
 }

lib/models/v3/Sequelize.ts

@@ -15,6 +15,7 @@ export class Sequelize extends SequelizeOrigin implements BaseSequelize {
   Model: any = Function;
 
   thoughMap: {[through: string]: any} = {};
+  _: {[modelName: string]: typeof Model} = {};
   init: (config: ISequelizeConfig) => void;
   addModels: (models: Array<typeof Model>|string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;

lib/models/v4/Sequelize.ts

@@ -11,6 +11,7 @@ let preparedConfig;
 export class Sequelize extends OriginSequelize implements BaseSequelize {
 
   thoughMap: {[through: string]: any} = {};
+  _: {[modelName: string]: typeof Model} = {};
   init: (config: ISequelizeConfig) => void;
   addModels: (models: Array<typeof Model>|string[]) => void;
   associateModels: (models: Array<typeof Model>) => void;

package.json

@@ -59,6 +59,7 @@
     "sinon-chai": "2.8.0",
     "source-map-support": "0.4.14",
     "sqlite3": "3.1.8",
+    "ts-node": "3.0.4",
     "tslint": "4.3.1",
     "typescript": "2.2.1",
     "uuid-validate": "0.0.2"

test/models/ShoeWithValidation.ts

@@ -51,6 +51,7 @@ export class ShoeWithValidation extends Model<ShoeWithValidation> {
   brandUrl: string;
 
   @Is('HexColor', hexColor)
+  @Length({min: 4, msg: 'too short'})
   @Column
   primaryColor: string;
 

test/specs/models/sequelize.spec.ts

@@ -60,4 +60,15 @@ describe('sequelize', () => {
 
   });
 
+  describe('model', () => {
+
+    it('should make class references of loaded models available', () => {
+
+      sequelize.addModels([__dirname + '/../../models/exports/']);
+
+      expect(sequelize._).to.have.property('Game', Game);
+      expect(sequelize._).to.have.property('Gamer', Gamer);
+    });
+
+  });
 });

test/specs/validation.spec.ts

@@ -7,6 +7,7 @@ import {
   hexColor, HEX_REGEX, PRODUCED_AT_IS_AFTER, PRODUCED_AT_IS_BEFORE, UUID_VERSION, MAX, MIN, NOT, IS_IN, NOT_CONTAINS
 } from "../models/ShoeWithValidation";
 import {majorVersion} from "../../lib/utils/versioning";
+import {Is} from "../../lib/annotations/validation/Is";
 
 use(chaiAsPromised);
 
@@ -184,6 +185,20 @@ describe('validation', () => {
 
   });
 
+  describe('decorators', () => {
+
+    describe('Is', () => {
+
+      it('Should throw due to missing name of function', () => {
+
+        expect(() => Is(() => null)).to.throw(/Passed validator function must have a name/);
+
+      });
+
+    });
+
+  });
+
   describe('only', () => {
 
     it('should not throw', () => {