fix: attrs failing with lazy instances

jorgebodega · Feb 9, 2022 · c8ddda8 · c8ddda8
1 parent 3efe94e
commit c8ddda8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/factory.ts b/src/factory.ts
@@ -37,7 +37,9 @@ export abstract class Factory<T> {
    */
   async create(overrideParams: Partial<FactorizedAttrs<T>> = {}, saveOptions?: SaveOptions): Promise<T> {
     const attrs = { ...this.attrs, ...overrideParams }
-    const entity = await this.makeEntity(attrs, true)
+    const preloadedAttrs = Object.entries(attrs).filter(([, value]) => !(value instanceof LazyInstanceAttribute))
+
+    const entity = await this.makeEntity(Object.fromEntries(preloadedAttrs) as FactorizedAttrs<T>, true)
 
     const em = (await fetchConnection()).createEntityManager()
     const savedEntity = await em.save<T>(entity, saveOptions)

diff --git a/src/index.ts b/src/index.ts
@@ -4,5 +4,6 @@ export * from './lazyAttribute'
 export * from './instanceAttribute'
 export * from './lazyInstanceAttribute'
 export * from './seeder'
+export * from './subfactory'
 export * from './types'
 export * from './useSeeders'
diff --git a/src/types.ts b/src/types.ts
@@ -14,6 +14,6 @@ export type ConnectionConfiguration = {
 export type Constructable<T> = new () => T
 export type FactorizedAttr<V> = V | (() => V | Promise<V>) | Subfactory<V extends Array<infer U> ? U : V>
 export type FactorizedAttrs<T> = {
-  [K in keyof Partial<T>]: FactorizedAttr<T[K]> | LazyAttribute<T, T[K]>
+  [K in keyof Partial<T>]: FactorizedAttr<T[K]> | LazyAttribute<T, FactorizedAttr<T[K]>>
 }
-export type LazyAttributeCallback<T, V> = (entity: T) => FactorizedAttr<V>
+export type LazyAttributeCallback<T, V> = (entity: T) => V