fix(wabe): array in object

palixir · Jan 27, 2025 · 80493c8 · 80493c8
1 parent e6f9564
commit 80493c8
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 3 deletions.
diff --git a/packages/wabe/src/graphql/GraphQLSchema.test.ts b/packages/wabe/src/graphql/GraphQLSchema.test.ts
@@ -224,6 +224,47 @@ describe('GraphqlSchema', () => {
     })
   })
 
+  it('should be able to create an array in an object', async () => {
+    const { wabe } = await createWabe({
+      classes: [
+        {
+          name: 'TestClass',
+          fields: {
+            field1: {
+              type: 'Array',
+              typeValue: 'Object',
+              object: {
+                name: 'SubOject',
+                fields: {
+                  field2: {
+                    type: 'Array',
+                    typeValue: 'String',
+                    required: true,
+                    requiredValue: false,
+                  },
+                  field3: { type: 'Int' },
+                },
+              },
+            },
+          },
+        },
+      ],
+    })
+
+    expect(
+      getTypeFromGraphQLSchema({
+        schema: wabe.config.graphqlSchema || ({} as any),
+        type: 'Type',
+        name: 'TestClassSubOject',
+      }).input,
+    ).toEqual({
+      field2: '[String]!',
+      field3: 'Int',
+    })
+
+    await wabe.close()
+  })
+
   // It is usefull when we have the permission to create but not to read the data
   // We should be able to create a new object without return any data
   // Just use the "ok" field

diff --git a/packages/wabe/src/graphql/parser.ts b/packages/wabe/src/graphql/parser.ts
@@ -162,6 +162,27 @@ export const GraphqlParser: GraphqlParserConstructor =
               }
             }
 
+            if (
+              currentField.typeValue &&
+              // @ts-expect-error
+              templateScalarType[currentField.typeValue]
+            ) {
+              const graphqlType = getGraphqlType({
+                type: currentField.type,
+                // @ts-expect-error
+                typeValue: currentField.typeValue,
+                isWhereType: false,
+                requiredValue: currentField.requiredValue,
+              })
+
+              acc[key] = {
+                type:
+                  currentField.required && !forceRequiredToFalse
+                    ? new GraphQLNonNull(graphqlType)
+                    : graphqlType,
+              }
+            }
+
             return acc
           }
 

diff --git a/packages/wabe/src/server/index.ts b/packages/wabe/src/server/index.ts
@@ -40,6 +40,7 @@ export interface WabeConfig<T extends WabeTypes> {
   hostname?: string
   security?: SecurityConfig
   schema?: SchemaInterface<T>
+  graphqlSchema?: GraphQLSchema
   database: DatabaseConfig
   codegen?:
     | {
@@ -219,7 +220,7 @@ export class Wabe<T extends WabeTypes> {
 
     const types = graphqlSchema.createSchema()
 
-    const schema = new GraphQLSchema({
+    this.config.graphqlSchema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: 'Query',
         fields: types.queries,
@@ -241,7 +242,7 @@ export class Wabe<T extends WabeTypes> {
       await generateCodegen({
         path: this.config.codegen.path,
         schema: wabeSchema.schema,
-        graphqlSchema: schema,
+        graphqlSchema: this.config.graphqlSchema,
       })
 
       // If we just want codegen we exit before server created.
@@ -323,7 +324,7 @@ export class Wabe<T extends WabeTypes> {
 
     this.server.usePlugin(
       WobeGraphqlYogaPlugin({
-        schema,
+        schema: this.config.graphqlSchema,
         maskedErrors: false,
         graphqlEndpoint: '/graphql',
         plugins: this.config.isProduction ? [useDisableIntrospection()] : [],