fix: nested relations not getting normalized correctly (#50)

Author: kiaking

src/model/Model.ts

@@ -232,12 +232,7 @@ export class Model {
 
     ownerKey = ownerKey ?? instance.$getLocalKey()
 
-    return new HasManyBy(
-      instance,
-      related.newRawInstance(),
-      foreignKey,
-      ownerKey
-    )
+    return new HasManyBy(this.newRawInstance(), instance, foreignKey, ownerKey)
   }
 
   /**

src/model/attributes/relations/BelongsTo.ts

@@ -51,7 +51,7 @@ export class BelongsTo extends Relation {
    * Define the normalizr schema for the relation.
    */
   define(schema: Schema): NormalizrSchema {
-    return schema.one(this.child)
+    return schema.one(this.child, this.parent)
   }
 
   /**

src/model/attributes/relations/HasMany.ts

@@ -41,7 +41,7 @@ export class HasMany extends Relation {
    * Define the normalizr schema for the relation.
    */
   define(schema: Schema): NormalizrSchema {
-    return schema.many(this.related)
+    return schema.many(this.related, this.parent)
   }
 
   /**

src/model/attributes/relations/HasManyBy.ts

@@ -51,7 +51,7 @@ export class HasManyBy extends Relation {
    * Define the normalizr schema for the relation.
    */
   define(schema: Schema): NormalizrSchema {
-    return schema.many(this.child)
+    return schema.many(this.child, this.parent)
   }
 
   /**

src/model/attributes/relations/HasOne.ts

@@ -41,7 +41,7 @@ export class HasOne extends Relation {
    * Define the normalizr schema for the relation.
    */
   define(schema: Schema): NormalizrSchema {
-    return schema.one(this.related)
+    return schema.one(this.related, this.parent)
   }
 
   /**

src/schema/Schema.ts

@@ -25,16 +25,17 @@ export class Schema {
   /**
    * Create a single schema.
    */
-  one(model?: Model): Normalizr.Entity {
+  one(model?: Model, parent?: Model): Normalizr.Entity {
     model = model || this.model
+    parent = parent || this.model
 
     const entity = model.$entity()
 
     if (this.schemas[entity]) {
       return this.schemas[entity]
     }
 
-    const schema = this.newEntity(model, this.model)
+    const schema = this.newEntity(model, parent)
 
     this.schemas[entity] = schema
 
@@ -48,8 +49,8 @@ export class Schema {
   /**
    * Create an array schema for the given model.
    */
-  many(model: Model): Normalizr.Array {
-    return new Normalizr.Array(this.one(model))
+  many(model: Model, parent?: Model): Normalizr.Array {
+    return new Normalizr.Array(this.one(model, parent))
   }
 
   /**

test/feature/relations/nested/nested_relations.spec.ts

@@ -0,0 +1,60 @@
+import { createStore, assertState } from 'test/Helpers'
+import { Model, Attr, Str, BelongsTo, HasMany } from '@/index'
+
+describe('feature/relations/nested/nested_relations', () => {
+  class User extends Model {
+    static entity = 'users'
+
+    @Attr() id!: number
+    @Str('') name!: string
+
+    @HasMany(() => Follower, 'userId')
+    followers!: Follower[]
+  }
+
+  class Follower extends Model {
+    static entity = 'followers'
+
+    @Attr() id!: number
+    @Attr() userId!: number
+  }
+
+  class Post extends Model {
+    static entity = 'posts'
+
+    @Attr() id!: number
+    @Attr() userId!: number | null
+    @Str('') title!: string
+
+    @BelongsTo(() => User, 'userId')
+    author!: User | null
+  }
+
+  it('inserts a nested relations with missing foreign key', async () => {
+    const store = createStore()
+
+    await store.$repo(Post).insert({
+      id: 1,
+      userId: 1,
+      title: 'Title 01',
+      author: {
+        id: 1,
+        name: 'John Doe',
+        followers: [{ id: 1 }, { id: 2 }]
+      }
+    })
+
+    assertState(store, {
+      users: {
+        1: { id: 1, name: 'John Doe' }
+      },
+      followers: {
+        1: { id: 1, userId: 1 },
+        2: { id: 2, userId: 1 }
+      },
+      posts: {
+        1: { id: 1, userId: 1, title: 'Title 01' }
+      }
+    })
+  })
+})