#115 + lint fixes

Author: etsuo

index.ts

@@ -2,4 +2,3 @@ import 'colors';
 
 export * from './src/boot';
 export * from './src/core';
-

spec/helpers/_.0.reporter.ts

@@ -1,5 +1,5 @@
 import {DisplayProcessor, SpecReporter} from 'jasmine-spec-reporter';
-import 'source-map-support/register';
+import 'source-map-support';
 import SuiteInfo = jasmine.SuiteInfo;
 
 class CustomProcessor extends DisplayProcessor {

spec/helpers/sakuraapi.ts

@@ -1,7 +1,7 @@
+import {json} from 'body-parser';
+import * as helmet from 'helmet';
 import * as path from 'path';
 import {SakuraApi, SakuraApiPlugin} from '../../src/core/sakura-api';
-import bodyParser = require('body-parser');
-import helmet = require('helmet');
 
 const baseUri = '/testApi';
 
@@ -28,6 +28,7 @@ process.on('unhandledRejection', (r) => {
   console.log('-'.repeat(process.stdout.columns).red);
   // tslint:enable:no-console
 
+  throw r;
 });
 
 export function testSapi(options: ITestSapiOptions): SakuraApi {
@@ -42,7 +43,7 @@ export function testSapi(options: ITestSapiOptions): SakuraApi {
   });
 
   sapi.addMiddleware(helmet(), 0);
-  sapi.addMiddleware(bodyParser.json(), 0);
+  sapi.addMiddleware(json(), 0);
 
   if (process.env.TRACE_REQ) {
     sapi.addMiddleware((req, res, next) => {

src/boot/sakura-api-config.spec.ts

@@ -1,7 +1,7 @@
+import * as path from 'path';
 import {testMongoDbUrl, testSapi} from '../../spec/helpers/sakuraapi';
 import {SakuraMongoDbConnection} from '../core/sakura-mongo-db-connection';
 import {SakuraApiConfig} from './sakura-api-config';
-import path = require('path');
 
 describe('sakura-api-config', () => {
 

src/core/@injectable/injectable.spec.ts

@@ -13,6 +13,8 @@ import {
   ProvidersMustBeDecoratedWithInjectableError
 } from './injectable';
 
+/* tslint:disable:no-shadowed-variable */
+
 describe('@Injectable', () => {
 
   describe('Error handling', () => {
@@ -403,3 +405,5 @@ describe('@Injectable', () => {
     });
   });
 });
+
+/* tslint:enable:no-shadowed-variable */

src/core/@injectable/sapi-injectable-mixin.ts

@@ -12,19 +12,19 @@ import {SakuraApi} from '../sakura-api';
  *
  * See [[SapiModelMixin]] for more information.
  */
-export function SapiInjectableMixin<T extends Constructor<{}>>(Base?: T) {
-  Base = Base || class {
+export function SapiInjectableMixin<T extends Constructor<{}>>(base?: T) {
+  base = base || class {
   } as any;
 
-  return class extends Base {
-    constructor(...args: any[]) {
-      super(...args);
-    }
-
+  return class extends base {
     static sapi: SakuraApi;
     static sapiConfig: any;
 
     sapi: SakuraApi;
     sapiConfig: any;
+
+    constructor(...args: any[]) {
+      super(...args);
+    }
   };
 }

src/core/@model/json.spec.ts

@@ -781,18 +781,18 @@ describe('@Json', () => {
     describe('id behavior', () => {
 
       @Model()
-      class User extends SapiModelMixin() {
+      class User1 extends SapiModelMixin() {
       }
 
       it('unmarshalls id as an ObjectID when it is a valid ObjectID', () => {
         const data = {
           id: new ObjectID().toString()
         };
 
-        const user = User.fromJson(data);
+        const user = User1.fromJson(data);
 
-        expect(new User().id).toBeDefined('nope');
-        expect(user instanceof User).toBeTruthy('Should have gotten back an instance of User');
+        expect(new User1().id).toBeDefined('nope');
+        expect(user instanceof User1).toBeTruthy('Should have gotten back an instance of User');
         expect(user.id instanceof ObjectID).toBeTruthy();
         expect(user._id instanceof ObjectID).toBeTruthy();
       });

src/core/@model/model.spec.ts

@@ -87,11 +87,11 @@ describe('core/@Model', () => {
             db: 'test'
           }
         })
-        class TestDbConfig {
+        class TestDbConfig1 {
         }
 
         expect(() => {
-          new TestDbConfig(); // tslint:disable-line
+          new TestDbConfig1(); // tslint:disable-line
         }).toThrow();
       });
     });

src/core/@model/model.ts

@@ -1010,10 +1010,10 @@ function toDb(changeSet?: any): object {
 
       if (shouldRecurse(source[key])) {
 
-        const newKey = keyMapper(key, source[key], dbOptionsByPropertyName);
-        if (newKey !== undefined) {
+        const aNewKey = keyMapper(key, source[key], dbOptionsByPropertyName);
+        if (aNewKey !== undefined) {
           const value = mapModelToDb(source[key], ++depth);
-          result[newKey] = value;
+          result[aNewKey] = value;
         }
 
         continue;
@@ -1129,11 +1129,11 @@ function toJson(): any {
       }
 
       if (shouldRecurse(source[key])) {
-        const newKey = keyMapper(key, source[key], jsonFieldNamesByProperty);
+        const aNewKey = keyMapper(key, source[key], jsonFieldNamesByProperty);
 
-        if (newKey !== undefined) {
+        if (aNewKey !== undefined) {
           const value = mapModelToJson(source[key]);
-          result[newKey] = value;
+          result[aNewKey] = value;
         }
 
         continue;

src/core/@model/sapi-model-mixin.ts

@@ -1,3 +1,4 @@
+// tslint:disable:max-line-length
 import {
   Collection, CollectionInsertOneOptions, CollectionOptions, Cursor, Db, DeleteWriteOpResultObject,
   InsertOneWriteOpResult, ObjectID, ReplaceOneOptions, UpdateWriteOpResult
@@ -44,17 +45,15 @@ import {IDbGetParams, IFromDbOptions} from './';
  *
  * Just remember to stick to the interface in case SakuraAPI is calling the method being overriden internally.
  */
-export function SapiModelMixin<T extends Constructor<{}>>(Base?: T) {
-  Base = Base || class {
+
+export function SapiModelMixin<C extends Constructor<{}>>(base?: C) {
+  base = base || class {
   } as any;
 
-  return class extends Base {
-    constructor(...args: any[]) {
-      super(...args);
-    }
+  return class extends base {
 
     static fromDb: <T>(this: { new(): T }, json: any, options?: IFromDbOptions) => T;
-    static fromJson: <T>(this: { new(...any): T }, json: object) => T;
+    static fromJson: <T>(this: { new(...params): T }, json: object) => T;
     static fromJsonToDb: (json: any) => any;
 
     static fromDbArray: <T>(this: { new(): T }, jsons: object[], options?: IFromDbOptions) => T[];
@@ -90,5 +89,12 @@ export function SapiModelMixin<T extends Constructor<{}>>(Base?: T) {
     toDb: (changeSet?: object) => any;
     toJson: (projection?: any) => any;
     toJsonString: (replacer?: () => any | Array<string | number>, space?: string | number) => string;
+
+    constructor(...args: any[]) {
+      super(...args);
+    }
+
   };
 }
+
+// tslint:enable:max-line-length