Remove source from serializable data structure #5 (#6)

Author: ovidiuch

src/__tests__/multiNamed.js

@@ -41,24 +41,12 @@ describe('Named multi fixture file', () => {
       );
     });
 
-    it('has source', () => {
-      expect(fixtures[0].source).toEqual({
-        name: 'A fix',
-        component: Bold,
-        props: {
-          name: 'Alina'
-        }
-      });
+    it('has fixtureIndex 0', () => {
+      expect(fixtures[0].fixtureIndex).toBe(0);
     });
 
-    it('has source', () => {
-      expect(fixtures[1].source).toEqual({
-        name: 'S fix',
-        component: Bold,
-        props: {
-          name: 'Sarah'
-        }
-      });
+    it('has fixtureIndex 1', () => {
+      expect(fixtures[1].fixtureIndex).toBe(1);
     });
   });
 
@@ -79,14 +67,8 @@ describe('Named multi fixture file', () => {
       );
     });
 
-    it('has source', () => {
-      expect(fixtures[0].source).toEqual({
-        name: 'J fix',
-        component: Italics,
-        props: {
-          name: 'John'
-        }
-      });
+    it('has fixtureIndex 2', () => {
+      expect(fixtures[0].fixtureIndex).toBe(2);
     });
   });
 });

src/__tests__/multiUnnamed.js

@@ -41,22 +41,12 @@ describe('Unnamed multi fixture file', () => {
       );
     });
 
-    it('has source', () => {
-      expect(fixtures[0].source).toEqual({
-        component: Bold,
-        props: {
-          name: 'Alina'
-        }
-      });
+    it('has fixtureIndex 0', () => {
+      expect(fixtures[0].fixtureIndex).toBe(0);
     });
 
-    it('has source', () => {
-      expect(fixtures[1].source).toEqual({
-        component: Bold,
-        props: {
-          name: 'Sarah'
-        }
-      });
+    it('has fixtureIndex 1', () => {
+      expect(fixtures[1].fixtureIndex).toBe(1);
     });
   });
 
@@ -77,13 +67,8 @@ describe('Unnamed multi fixture file', () => {
       );
     });
 
-    it('has source', () => {
-      expect(fixtures[0].source).toEqual({
-        component: Italics,
-        props: {
-          name: 'John'
-        }
-      });
+    it('has fixtureIndex 2', () => {
+      expect(fixtures[0].fixtureIndex).toBe(2);
     });
   });
 });

src/__tests__/singleNamed.js

@@ -23,13 +23,7 @@ describe('Named single fixture file', () => {
     );
   });
 
-  it('has fixture source', () => {
-    expect(components[0].fixtures[0].source).toEqual({
-      component: Italics,
-      name: 'foo fixture',
-      props: {
-        name: 'John'
-      }
-    });
+  it('has null fixtureIndex', () => {
+    expect(components[0].fixtures[0].fixtureIndex).toBe(null);
   });
 });

src/__tests__/singleUnnamed.js

@@ -23,12 +23,7 @@ describe('Unnamed single fixture file', () => {
     );
   });
 
-  it('has fixture source', () => {
-    expect(components[0].fixtures[0].source).toEqual({
-      component: Italics,
-      props: {
-        name: 'John'
-      }
-    });
+  it('has null fixtureIndex', () => {
+    expect(components[0].fixtures[0].fixtureIndex).toBe(null);
   });
 });

src/getComponents.js

@@ -62,6 +62,7 @@ export async function getComponents(args: Args): Promise<Components> {
     // Can't use forEach because we want each (async) loop to be serial
     for (let j = 0; j < fixturesInFile.length; j++) {
       const fixture = fixturesInFile[j];
+      const fixtureIndex = isMultiFixture ? j : null;
       const { component, name } = fixture;
 
       // TODO: Throw if fixture.component is missing
@@ -79,9 +80,9 @@ export async function getComponents(args: Args): Promise<Components> {
 
       compFixtures.push({
         filePath: fixturePath,
+        fixtureIndex,
         name: name || defaultFixtureNamer(component),
-        namespace,
-        source: fixture
+        namespace
       });
 
       if (!componentPaths.get(component)) {
@@ -90,7 +91,7 @@ export async function getComponents(args: Args): Promise<Components> {
           componentPath
         } = await getComponentInfoFromFixture({
           fixturePath,
-          fixtureIndex: isMultiFixture ? j : null
+          fixtureIndex
         });
 
         // It's possible to identify the component name but not the file path

src/types.js

@@ -3,20 +3,20 @@
 import type { ComponentType } from 'react';
 
 export type Fixture = {
-  name: string,
-  namespace: string,
   filePath: string,
-  source: Object
+  fixtureIndex: number | null,
+  name: string,
+  namespace: string
 };
 
 export type Fixtures = Array<Fixture>;
 
 export type FixturesByComponent = Map<ComponentType<*>, Fixtures>;
 
 export type Component = {
+  filePath: string | null,
   name: string,
   namespace: string,
-  filePath: string | null,
   type: ComponentType<*>,
   fixtures: Fixtures
 };