Merge branch 'master' of https://github.com/RobinBuschmann/sequelize-typescript

Author: RobinBuschmann

lib/services/models.ts

@@ -153,7 +153,7 @@ export function getSequelizeTypeByDesignType(target: any, propertyName: string):
     return dataType;
   }
 
-  throw new Error(`Specified type of property '${propertyName}' 
+  throw new Error(`Specified type of property '${propertyName}'
             cannot be automatically resolved to a sequelize data type. Please
             define the data type manually`);
 }
@@ -170,8 +170,9 @@ export function getModels(arg: Array<typeof Model|string>): Array<typeof Model>
       const _models = fs
         .readdirSync(dir as string)
         .filter(file => {
+          // TODO extension is not necessarily only the lasst three characters
           const extension = file.slice(-3);
-          return extension === '.js' || extension === '.ts';
+          return extension === '.js' || (extension === '.ts' && file.slice(-5) !== '.d.ts');
         })
         .map(file => path.parse(file).name)
         .filter(uniqueFilter)

test/specs/models/sequelize.spec.ts

@@ -58,6 +58,16 @@ describe('sequelize', () => {
 
     });
 
+    describe('definition files', () => {
+      it('should not load in definition files', () => {
+        sequelize.addModels([__dirname + '/../../models/exports/']);
+
+        expect(() => Game.build({})).not.to.throw;
+
+        expect(Object.keys(sequelize.models).length).to.equal(2);
+      });
+    });
+
   });
 
   describe('model', () => {