fix: Return empty model object none related

vuex-orm · Mar 10, 2018 · 02fb245 · 02fb245
1 parent 5a8789f
commit 02fb245
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 0 deletions.
diff --git a/src/attributes/relations/BelongsTo.ts b/src/attributes/relations/BelongsTo.ts
@@ -52,6 +52,10 @@ export default class BelongsTo extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model | null {
+    if (value === null) {
+      return null
+    }
+
     if (value === undefined) {
       return null
     }

diff --git a/src/attributes/relations/BelongsToMany.ts b/src/attributes/relations/BelongsToMany.ts
@@ -82,6 +82,10 @@ export default class BelongsToMany extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/HasMany.ts b/src/attributes/relations/HasMany.ts
@@ -44,6 +44,10 @@ export default class HasMany extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/HasManyBy.ts b/src/attributes/relations/HasManyBy.ts
@@ -44,6 +44,10 @@ export default class HasManyBy extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/HasManyThrough.ts b/src/attributes/relations/HasManyThrough.ts
@@ -72,6 +72,10 @@ export default class HasManyThrough extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/HasOne.ts b/src/attributes/relations/HasOne.ts
@@ -52,6 +52,10 @@ export default class HasOne extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model | null {
+    if (value === null) {
+      return null
+    }
+
     if (value === undefined) {
       return null
     }

diff --git a/src/attributes/relations/MorphMany.ts b/src/attributes/relations/MorphMany.ts
@@ -52,6 +52,10 @@ export default class MorphMany extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/MorphOne.ts b/src/attributes/relations/MorphOne.ts
@@ -60,6 +60,10 @@ export default class MorphOne extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model | null {
+    if (value === null) {
+      return null
+    }
+
     if (value === undefined) {
       return null
     }

diff --git a/src/attributes/relations/MorphTo.ts b/src/attributes/relations/MorphTo.ts
@@ -48,6 +48,10 @@ export default class MorphTo extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, parent: Record, _key: string): Model | null {
+    if (value === null) {
+      return null
+    }
+
     if (value === undefined) {
       return null
     }

diff --git a/src/attributes/relations/MorphToMany.ts b/src/attributes/relations/MorphToMany.ts
@@ -80,6 +80,10 @@ export default class MorphToMany extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }

diff --git a/src/attributes/relations/MorphedByMany.ts b/src/attributes/relations/MorphedByMany.ts
@@ -80,6 +80,10 @@ export default class MorphedByMany extends Relation {
    * instantiating a model or creating a plain object from a model.
    */
   make (value: any, _parent: Record, _key: string): Model[] {
+    if (value === null) {
+      return []
+    }
+
     if (value === undefined) {
       return []
     }