@commitspark/graphql-api 0.11.1 → 0.80.0

package/src/graphql/queries-mutations-generator.service.ts

@@ -28,7 +28,7 @@ export class QueriesMutationsGeneratorService {
       const typeName = objectType.name
 
       const queryAllName = `all${typeName}s`
-      const queryAllString = `${queryAllName}: [${objectType.name}]`
+      const queryAllString = `${queryAllName}: [${objectType.name}!]`
       const queryAllResolver: GraphQLFieldResolver<
         any,
         ApolloContext,
@@ -56,7 +56,7 @@ export class QueriesMutationsGeneratorService {
 
       const inputTypeName = `${typeName}Input`
       const createMutationName = `create${typeName}`
-      const createMutationString = `${createMutationName}(id: ID!, data:${inputTypeName}, message:String): ${typeName}`
+      const createMutationString = `${createMutationName}(id: ID!, data: ${inputTypeName}!, commitMessage: String): ${typeName}`
       const createMutationResolver: GraphQLFieldResolver<
         any,
         ApolloContext,
@@ -65,7 +65,7 @@ export class QueriesMutationsGeneratorService {
       > = this.mutationCreateResolverGenerator.createResolver(typeName)
 
       const updateMutationName = `update${typeName}`
-      const updateMutationString = `${updateMutationName}(id: ID!, data:${inputTypeName}, message:String): ${typeName}`
+      const updateMutationString = `${updateMutationName}(id: ID!, data: ${inputTypeName}!, commitMessage: String): ${typeName}`
       const updateMutationResolver: GraphQLFieldResolver<
         any,
         ApolloContext,
@@ -74,7 +74,7 @@ export class QueriesMutationsGeneratorService {
       > = this.mutationUpdateResolverGenerator.createResolver(typeName)
 
       const deleteMutationName = `delete${typeName}`
-      const deleteMutationString = `${deleteMutationName}(id: ID!, message:String): DeletionResult`
+      const deleteMutationString = `${deleteMutationName}(id: ID!, commitMessage: String): ID`
       const deleteMutationResolver: GraphQLFieldResolver<
         any,
         ApolloContext,
@@ -119,7 +119,7 @@ export class QueriesMutationsGeneratorService {
 
   public generateTypeNameQuery(): IGeneratedQuery<Promise<string>> {
     const entryTypeQueryName = '_typeName'
-    const entryTypeQueryString = `${entryTypeQueryName}(id: ID!): String`
+    const entryTypeQueryString = `${entryTypeQueryName}(id: ID!): String!`
     const entryTypeQueryResolver: GraphQLFieldResolver<
       any,
       ApolloContext,

package/src/graphql/resolver-generators/mutation-create-resolver-generator.ts

@@ -5,9 +5,9 @@ import { GraphQLError } from 'graphql/error/GraphQLError'
 import { EntryReferenceUtil } from '../schema-utils/entry-reference-util'
 import { isObjectType } from 'graphql'
 import {
-  EntryDraft,
-  EntryData,
   ENTRY_ID_INVALID_CHARACTERS,
+  EntryData,
+  EntryDraft,
 } from '@commitspark/git-adapter'
 
 export class MutationCreateResolverGenerator {
@@ -104,7 +104,7 @@ export class MutationCreateResolverGenerator {
         ref: context.branch,
         parentSha: context.getCurrentRef(),
         entries: [newEntryDraft, ...referencedEntryUpdates],
-        message: args.message,
+        message: args.commitMessage,
       })
       context.setCurrentRef(commit.ref)
 

package/src/graphql/resolver-generators/mutation-delete-resolver-generator.ts

@@ -88,13 +88,11 @@ export class MutationDeleteResolverGenerator {
           },
           ...referencedEntryUpdates,
         ],
-        message: args.message,
+        message: args.commitMessage,
       })
       context.setCurrentRef(commit.ref)
 
-      return {
-        id: args.id,
-      }
+      return args.id
     }
   }
 }

package/src/graphql/resolver-generators/mutation-update-resolver-generator.ts

@@ -102,7 +102,7 @@ export class MutationUpdateResolverGenerator {
           { ...existingEntry, data: mergedData, deletion: false },
           ...referencedEntryUpdates,
         ],
-        message: args.message,
+        message: args.commitMessage,
       })
       context.setCurrentRef(commit.ref)
 

package/src/graphql/schema-generator.service.ts

@@ -92,9 +92,6 @@ export class SchemaGeneratorService {
       '\n' +
       'type ListMetadata {\n' +
       '  count: Int!\n' +
-      '}\n\n' +
-      'type DeletionResult {\n' +
-      '  id: ID\n' +
       '}\n'
 
     const generatedUnionTypeResolvers: Record<string, UnionTypeResolver> = {}

package/src/graphql/schema-utils/union-type-util.ts

@@ -8,8 +8,7 @@ export class UnionTypeUtil {
 
     // Based on our @oneOf directive, we expect only one field whose name
     // corresponds to the concrete type's name.
-    const firstKey = Object.keys(fieldValue)[0]
-    return firstKey.slice(0, 1).toUpperCase() + firstKey.slice(1)
+    return Object.keys(fieldValue)[0]
   }
 
   public getUnionValue(fieldValue: any): EntryData {