Merge pull request #26 from joshnies-marketspark/fix/resolve-null

Fix resolveEntity to allow null attributes
w3tecch · Mar 25, 2020 · 4524b69 · 4524b69
2 parents 3ec18a3 + 8ff9367
commit 4524b69
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/entity-factory.ts b/src/entity-factory.ts
@@ -94,10 +94,10 @@ export class EntityFactory<Entity, Settings> {
     for (const attribute in entity) {
       if (entity.hasOwnProperty(attribute)) {
         if (isPromiseLike(entity[attribute])) {
-          entity[attribute] = await entity[attribute]
+          entity[attribute] = entity[attribute]
         }
 
-        if (typeof entity[attribute] === 'object' && !(entity[attribute] instanceof Date)) {
+        if (entity[attribute] && typeof entity[attribute] === 'object' && !(entity[attribute] instanceof Date)) {
           const subEntityFactory = entity[attribute]
           try {
             if (typeof (subEntityFactory as any).make === 'function') {