Merge pull request #5 from prashaantt/es5

Make ES5-friendly

Author: prashaantt

.npmignore

@@ -1,3 +1,4 @@
 *
 !lib/**
+lib/test
 !.npmignore

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-orm",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A super tiny ORM for TypeScript.",
   "main": "lib/index.js",
   "typings": "lib/index",
@@ -10,24 +10,31 @@
   "engines": {
     "node": ">=6.0.0"
   },
-  "files": [
-    "lib/"
-  ],
   "dependencies": {
     "@types/joi": "^10.0.0",
     "change-case": "^3.0.0",
     "joi": "^10.1.0"
   },
   "devDependencies": {
-    "@types/code": "^4.0.0",
+    "@types/code": "^4.0.1",
+    "@types/es6-promise": "^0.0.32",
     "@types/lab": "^11.1.0",
     "code": "^4.0.0",
+    "es6-promise": "^4.0.5",
     "lab": "^11.2.1",
+    "pre-commit": "^1.2.2",
+    "tslint": "^4.2.0",
     "typescript": "^2.1.4"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "rm -r lib && tsc",
     "compile": "tsc --noEmit",
+    "lint": "tslint -c tslint.json  './{src,test}/**/*.ts'",
     "test": "lab -T test/test-transform.js"
-  }
+  },
+  "pre-commit": [
+    "lint",
+    "test",
+    "build"
+  ]
 }

src/TinyORM.ts

@@ -26,7 +26,8 @@ export class TinyORM<T> {
     validate() {
         for (let key in this._props) {
             if (this._props[key].schema) {
-                const propName = this.constructor.name + '.' + key;
+                const className = (this.constructor as any).name;
+                const propName = className ? className + '.' + key : key;
 
                 validate(this._props[key].value, this._props[key].schema, propName);
             }

src/utils.ts

@@ -12,65 +12,65 @@ export function validate(value: any, schema: SchemaType, propName?: string) {
 }
 
 export function getObject(model: any) {
-    const obj = {};
+    let obj = {};
 
     for (let key in model) {
         const _prop = model[key];
 
         if (Array.isArray(_prop.value)) {
-            Object.assign(obj, {
-                [key]: _prop.value.map((item: any) => {
+            obj = {
+                ...obj, [key]: _prop.value.map((item: any) => {
 
                     if (typeof item !== 'object') {
                         return item;
                     }
 
                     return getObject(item);
                 })
-            });
+            };
         }
         else if (typeof _prop.value === 'object') {
-            Object.assign(obj, {
-                [key]: getObject(_prop.value)
-            });
+            obj = {
+                ...obj, [key]: getObject(_prop.value)
+            };
         }
         else {
-            Object.assign(obj, {
-                [key]: _prop.value || _prop
-            });
+            obj = {
+                ...obj, [key]: _prop.value || _prop
+            };
         }
     }
 
     return obj;
 }
 
 export function changeCaseDeep(obj: any, fn: Function) {
-    const changedObj = {} as any;
+    let changedObj = {};
 
     for (let key in obj) {
         const changedKeyCase = fn(key);
 
         if (Array.isArray(obj[key])) {
-            Object.assign(changedObj, {
-                [changedKeyCase]: obj[key].map((item: any) => {
+            changedObj = {
+                ...changedObj, [changedKeyCase]: obj[key].map((item: any) => {
 
                     if (typeof item !== 'object') {
                         return item;
                     }
 
                     return changeCaseDeep(item, fn);
                 })
-            });
+            };
         }
         else if (typeof obj[key] === 'object') {
-            Object.assign(changedObj, {
-                [changedKeyCase]: changeCaseDeep(obj[key], fn)
-            });
+            changedObj = {
+                ...changedObj, [changedKeyCase]: changeCaseDeep(obj[key], fn)
+            };
         }
         else {
-            Object.assign(changedObj, {
-                [changedKeyCase]: obj[key]
-            });
+            changedObj = {
+                ...changedObj, [changedKeyCase]: obj[key]
+            };
         }
     }
 

test/TinyORM.ts

@@ -217,10 +217,10 @@ suite('The TinyORM base class', () => {
             userEmail: 'test@example.com'
         });
 
-        const camelCasedTest = user.toDbObject();
-        assert(camelCasedTest.user_guid).equals(user.userGuid);
+        const camelCasedTest = user.toDbObject() as User;
+        assert((<any>camelCasedTest).user_guid).equals(user.userGuid);
         assert(camelCasedTest.userGuid).undefined();
-        assert(camelCasedTest.user_email).equals(user.userEmail);
+        assert((<any>camelCasedTest).user_email).equals(user.userEmail);
         assert(camelCasedTest.userEmail).undefined();
 
         done();

test/utils.ts

@@ -58,7 +58,6 @@ suite('The changeCaseDeep function', () => {
         };
 
         let transformedObj = changeCaseDeep(camelCasedObj, snakeCase);
-        assert(camelCasedObj).equals(camelCasedObj);
         assert(transformedObj).equals(snakeCased);
 
         transformedObj = changeCaseDeep(transformedObj, camelCase);

tsconfig.json

@@ -1,13 +1,12 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "target": "es6",
+        "target": "es5",
         "noImplicitAny": true,
         "strictNullChecks": true,
         "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
-        "inlineSourceMap": true,
         "outDir": "lib",
-        "declaration": true
+        "declaration": true,
+        "alwaysStrict": true
     }
 }