Merge pull request #58 from mizdra/fix-seq-bug

Fix issue that `seq` does not increment when using traits

Author: mizdra

e2e/index.e2e.ts

@@ -528,6 +528,25 @@ describe('defineTypeFactory', () => {
         height: number;
       }>();
     });
+    it('increments seq even with traits', async () => {
+      const ImageFactory = defineImageFactory({
+        defaultFields: {
+          id: dynamic(({ seq }) => `Image-${seq}`),
+          url: '#',
+        },
+        traits: {
+          avatar: {
+            defaultFields: {
+              url: 'https://example.com/avatar.png',
+            },
+          },
+        },
+      });
+      const image1 = await ImageFactory.build();
+      const image2 = await ImageFactory.use('avatar').build();
+      expect(image1.id).toBe('Image-0');
+      expect(image2.id).toBe('Image-1');
+    });
   });
   describe('transientFields', () => {
     it('basic', async () => {

src/helper/factory.ts

@@ -55,8 +55,8 @@ export function defineTypeFactoryInternal<
     defaultFields: defaultFieldsResolver,
     traits,
   }: TypeFactoryDefineOptions<Type, TransientFields, _DefaultFieldsResolver, _Traits>,
+  seqKey: object = {},
 ): TypeFactoryInterface<Type, TransientFields, _DefaultFieldsResolver, _Traits> {
-  const seqKey = {};
   const getSeq = () => getSequenceCounter(seqKey);
   return {
     async build<T extends FieldsResolver<Type & TransientFields>>(
@@ -98,10 +98,14 @@ export function defineTypeFactoryInternal<
 
       if (!trait) throw new Error(`Trait ("${String(traitName)}") is not defined.`);
       // @ts-expect-error -- Use @ts-expect-error as it is impossible to match types.
-      return defineTypeFactoryInternal(typeFieldNames, {
-        defaultFields: { ...defaultFieldsResolver, ...trait.defaultFields },
-        traits,
-      });
+      return defineTypeFactoryInternal(
+        typeFieldNames,
+        {
+          defaultFields: { ...defaultFieldsResolver, ...trait.defaultFields },
+          traits,
+        },
+        seqKey,
+      );
     },
     resetSequence() {
       resetSequence(seqKey);