Upgraded to Typescript 1.6, fixed errors that were caused by the more…

… constrained object type inspections.
spira · Sep 17, 2015 · a83ae5c · a83ae5c
1 parent 7c2101c
commit a83ae5c
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 18 deletions.
diff --git a/app/src/common/models/abstractModel.ts b/app/src/common/models/abstractModel.ts
@@ -3,13 +3,19 @@ namespace common.models {
 
     export interface IModel{
         getAttributes(includeUnderscoredKeys?:boolean):Object;
+        setExists(exists:boolean):void;
+        exists():boolean;
+    }
+
+    export interface IModelClass{
+        new(data?:any, exists?:boolean):IModel;
     }
 
     export interface IModelFactory{
         (data:any, exists?:boolean):IModel;
     }
 
-    export class AbstractModel implements IModel {
+    export abstract class AbstractModel implements IModel {
 
         protected _nestedEntityMap;
         private _exists:boolean;
@@ -47,7 +53,7 @@ namespace common.models {
          */
         protected hydrateNested(data:any, exists:boolean){
 
-            _.forIn(this._nestedEntityMap, (model:typeof AbstractModel, nestedKey:string) => {
+            _.forIn(this._nestedEntityMap, (model:IModelClass, nestedKey:string) => {
 
                 //if the nested map is not defined with a leading _ prepend one
                 if (!_.startsWith(nestedKey, '_')){
@@ -77,7 +83,7 @@ namespace common.models {
          * @returns {common.models.AbstractModel}
          * @param exists
          */
-        private hydrateModel(data:any, Model:typeof AbstractModel, exists:boolean){
+        private hydrateModel(data:any, Model:IModelClass, exists:boolean){
 
             let model = new Model(data);
             model.setExists(exists);

diff --git a/app/src/common/models/user/userModel.mock.ts b/app/src/common/models/user/userModel.mock.ts
@@ -2,7 +2,7 @@ namespace common.models {
 
     export class UserMock{
 
-        private static getMockData():global.IUserData {
+        public static getMockData():global.IUserData {
 
             let seededChance = new Chance(Math.random());
 
@@ -11,7 +11,7 @@ namespace common.models {
                 email:seededChance.email(),
                 firstName:seededChance.first(),
                 lastName:seededChance.last(),
-                emailConfirmed:seededChance.date(),
+                emailConfirmed: moment(seededChance.date()).toISOString(),
                 country:seededChance.country(),
                 avatarImgUrl:seededChance.url(),
                 regionCode: seededChance.pick(['uk', 'us', 'gb']),

diff --git a/app/src/common/models/user/userModel.spec.ts b/app/src/common/models/user/userModel.spec.ts
@@ -4,17 +4,7 @@ namespace common.models {
 
     describe('User Model', () => {
 
-        let userData:global.IUserData = {
-            userId:seededChance.guid(),
-            email:seededChance.email(),
-            firstName:seededChance.first(),
-            lastName:seededChance.last(),
-            emailConfirmed:seededChance.date(),
-            country:seededChance.country(),
-            avatarImgUrl:seededChance.url(),
-            userType: seededChance.pick(User.userTypes),
-            _socialLogins:(<common.models.UserSocialLogin[]>[])
-        };
+        let userData:global.IUserData = UserMock.getMockData();
 
         it('should instantiate a new user', () => {
 

diff --git a/app/src/common/models/user/userSocialLoginModel.ts b/app/src/common/models/user/userSocialLoginModel.ts
@@ -1,6 +1,6 @@
 module common.models {
 
-    export class UserSocialLogin extends AbstractModel {
+    export class UserSocialLogin extends AbstractModel implements global.ISocialLogin {
 
         public static googleType = 'google';
         public static facebookType = 'facebook';

diff --git a/app/src/common/services/image/imageService.ts b/app/src/common/services/image/imageService.ts
@@ -39,6 +39,7 @@ namespace common.services.image {
 
     export interface ICloudinaryFileUploadConfig extends ng.angularFileUpload.IFileUploadConfig {
         fields: ICloudinaryUploadRequest;
+        sendFieldsAs: string;
     }
 
     export interface IImageNotification {

diff --git a/app/src/global.d.ts b/app/src/global.d.ts
@@ -32,12 +32,24 @@ declare namespace global {
         password: string;
     }
 
+    export interface ISocialLogin {
+        userId:string;
+        provider:string;
+        token:string;
+    }
+
     export interface IUserData extends NgJwtAuth.IUser {
+        _self?:string;
         userId:string;
         firstName:string; //make compulsory
         lastName:string; //make compulsory
         userType?:string;
+        emailConfirmed?:string;
+        avatarImgUrl?:string;
+        country?:string;
+        regionCode?:string;
         _userCredential? : IUserCredential;
+        _socialLogins? : ISocialLogin[];
     }
 
     export interface IRootScope extends ng.IRootScopeService {

diff --git a/package.json b/package.json
@@ -78,6 +78,6 @@
     "selenium-webdriver": "^2.45.1",
     "sinon": "^1.15.4",
     "tsd": "^0.6.3",
-    "typescript": "^1.5.3"
+    "typescript": "^1.6"
   }
 }