fix npe on build when an array contains undefined values

90TechSAS · Aug 9, 2016 · 8cf0877 · 8cf0877
1 parent 470639c
commit 8cf0877
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build/app.js b/build/app.js
@@ -71,7 +71,7 @@ function ActiveRecord(model, name) {
                                 var populated = options[key].map(function (value) {
                                     if (typeof value === 'string' && _this[key] && Array.isArray(_this[key])) {
                                         var found = _this[key].find(function (element) {
-                                            return element._id === value;
+                                            return element && element._id === value;
                                         });
                                         if (found) return found;
                                     }

diff --git a/dest/temp/ActiveRecord.js b/dest/temp/ActiveRecord.js
@@ -70,7 +70,7 @@ function ActiveRecord(model, name) {
                                 var populated = options[key].map(function (value) {
                                     if (typeof value === 'string' && _this[key] && Array.isArray(_this[key])) {
                                         var found = _this[key].find(function (element) {
-                                            return element._id === value;
+                                            return element && element._id === value;
                                         });
                                         if (found) return found;
                                     }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "flogou <[email protected]>",
   "name": "angular-orm",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "homepage": "",
   "dependencies": {},

diff --git a/src/ActiveRecord.js b/src/ActiveRecord.js
@@ -42,7 +42,7 @@ export default function ActiveRecord(model, name){
                               (value)=>{
                                 if (typeof value === 'string' && this[key] && Array.isArray(this[key])){
                                   let found = this[key].find((element) => {
-                                    return element._id === value
+                                    return element && element._id === value
                                   });
                                   if (found) return found
                                 }