fix: json list codegen issues (Joystream#125)

* fix: json list codegen issues affects: @subsquid/hydra-cli, hydra-e2e-tests * style: fix lint errors affects: @subsquid/hydra-cli, hydra-e2e-tests
dzhelezov · Oct 18, 2021 · 9989361 · 9989361
1 parent 14bd1eb
commit 9989361
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/packages/hydra-cli/src/codegen.ts b/packages/hydra-cli/src/codegen.ts
@@ -155,7 +155,7 @@ function generateOrmModels(model: Model, dir: OutDir): void {
                   )}, from: obj => ${marshalFromJson(
                     prop,
                     'obj'
-                  )}}, nullable: ${prop.nullable})`
+                  )}}, nullable: ${prop.nullable}})`
                 )
                 break
               default:
@@ -330,7 +330,10 @@ function generateOrmModels(model: Model, dir: OutDir): void {
         convert = exp + '.toJSON()'
         break
       case 'list':
-        convert = `${exp}.map(val => ${marshalToJson(prop.type.item, 'val')})`
+        convert = `${exp}.map((val: any) => ${marshalToJson(
+          prop.type.item,
+          'val'
+        )})`
         break
       default:
         throw unsupportedCase(prop.type.kind)

diff --git a/packages/hydra-e2e-tests/fixtures/schema.graphql b/packages/hydra-e2e-tests/fixtures/schema.graphql
@@ -86,6 +86,7 @@ type EventB implements Event @entity {
   network: Network!
   indexInBlock: Int!
   field2: String!
+  statusList: [Status!]
 }
 
 type EventC implements Event @entity {

diff --git a/packages/hydra-e2e-tests/fixtures/src/mappings/loaders.ts b/packages/hydra-e2e-tests/fixtures/src/mappings/loaders.ts
@@ -8,6 +8,7 @@ import {
   EventParam,
   Network,
   SystemEvent,
+  HappyPoor,
 } from '../generated/model'
 
 export async function loader(ctx: BlockContext & StoreContext) {
@@ -33,6 +34,7 @@ export async function eventLoader({ store }: BlockContext & StoreContext) {
     network: Network.BABYLON,
     indexInBlock: 1,
     field2: 'field2',
+    statusList: [new HappyPoor({ isMale: true })],
   })
 
   const ce = new ComplexEntity()

diff --git a/packages/hydra-e2e-tests/test/jsonfields-e2e.test.ts b/packages/hydra-e2e-tests/test/jsonfields-e2e.test.ts
@@ -32,4 +32,27 @@ describe('end-to-end json fields tests', () => {
       }
     )
   })
+
+  it('fetch json list', () => {
+    return queryNode.test(
+      `
+      query {
+        eventBs {
+          statusList {
+            ... on HappyPoor {
+              isMale
+            }
+          }
+        }
+      }
+    `,
+      {
+        eventBs: [
+          {
+            statusList: [{ isMale: true }],
+          },
+        ],
+      }
+    )
+  })
 })