From a0d00743cbbdb77b27c1a3d5711407ffed5befac Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Sat, 20 Aug 2022 21:39:51 +0200 Subject: refactor(types): move and rename GraphQL types The api file in services was not really readable. So I move the types and I also rewrite a little the fetch function. I also rename most of the type to avoid conflict with preexisting types (like Node) and to keep consistency. --- src/ts/types/graphql/generics.ts | 25 +++++++ src/ts/types/graphql/mutations.ts | 61 ++++++++++++++++ src/ts/types/graphql/queries.ts | 147 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 src/ts/types/graphql/generics.ts create mode 100644 src/ts/types/graphql/mutations.ts create mode 100644 src/ts/types/graphql/queries.ts (limited to 'src/ts/types/graphql') diff --git a/src/ts/types/graphql/generics.ts b/src/ts/types/graphql/generics.ts new file mode 100644 index 0000000..dec5f10 --- /dev/null +++ b/src/ts/types/graphql/generics.ts @@ -0,0 +1,25 @@ +export type GraphQLPageInfo = { + endCursor: string; + hasNextPage: boolean; + total: number; +}; + +export type GraphQLEdges = { + cursor: string; + node: T; +}; + +export type GraphQLEdgesInput = { + after?: string; + before?: string; + first?: number; + last?: number; +}; + +export type GraphQLNode = { + node: T; +}; + +export type GraphQLNodes = { + nodes: T[]; +}; diff --git a/src/ts/types/graphql/mutations.ts b/src/ts/types/graphql/mutations.ts new file mode 100644 index 0000000..10bdbd1 --- /dev/null +++ b/src/ts/types/graphql/mutations.ts @@ -0,0 +1,61 @@ +import { sendCommentMutation } from '@services/graphql/comments.mutation'; +import { sendMailMutation } from '@services/graphql/contact.mutation'; + +//=========================================================================== +// Existing mutations list +//=========================================================================== + +export type Mutations = typeof sendMailMutation | typeof sendCommentMutation; + +//=========================================================================== +// Mutations response types +//=========================================================================== + +export type SendCommentResponse = { + createComment: T; +}; + +export type SendMailResponse = { + sendEmail: T; +}; + +export type MutationsResponseMap = { + [sendCommentMutation]: SendCommentResponse; + [sendMailMutation]: SendMailResponse; +}; + +export type Approved = { + approved: boolean; +}; + +export type SentComment = { + clientMutationId: string; + success: boolean; + comment: Approved | null; +}; + +//=========================================================================== +// Mutations input types +//=========================================================================== + +export type SendCommentInput = { + author: string; + authorEmail: string; + authorUrl: string; + clientMutationId: string; + commentOn: number; + content: string; + parent?: number; +}; + +export type SendMailInput = { + body: string; + clientMutationId: string; + replyTo: string; + subject: string; +}; + +export type MutationsInputMap = { + [sendCommentMutation]: SendCommentInput; + [sendMailMutation]: SendMailInput; +}; diff --git a/src/ts/types/graphql/queries.ts b/src/ts/types/graphql/queries.ts new file mode 100644 index 0000000..cc7b62b --- /dev/null +++ b/src/ts/types/graphql/queries.ts @@ -0,0 +1,147 @@ +import { + articleBySlugQuery, + articlesCardQuery, + articlesEndCursorQuery, + articlesQuery, + articlesSlugQuery, + totalArticlesQuery, +} from '@services/graphql/articles.query'; +import { commentsQuery } from '@services/graphql/comments.query'; +import { + thematicBySlugQuery, + thematicsListQuery, + thematicsSlugQuery, + totalThematicsQuery, +} from '@services/graphql/thematics.query'; +import { + topicBySlugQuery, + topicsListQuery, + topicsSlugQuery, + totalTopicsQuery, +} from '@services/graphql/topics.query'; +import { Slug } from '../app'; +import { RawComment } from '../raw-data'; +import { + GraphQLEdges, + GraphQLEdgesInput, + GraphQLNodes, + GraphQLPageInfo, +} from './generics'; + +//=========================================================================== +// Existing queries list +//=========================================================================== + +export type Queries = + | typeof articlesQuery + | typeof articleBySlugQuery + | typeof articlesCardQuery + | typeof articlesEndCursorQuery + | typeof articlesSlugQuery + | typeof commentsQuery + | typeof thematicBySlugQuery + | typeof thematicsListQuery + | typeof thematicsSlugQuery + | typeof topicBySlugQuery + | typeof topicsListQuery + | typeof topicsSlugQuery + | typeof totalArticlesQuery + | typeof totalThematicsQuery + | typeof totalTopicsQuery; + +//=========================================================================== +// Queries response types +//=========================================================================== + +export type ArticleResponse = { + post: T; +}; + +export type ArticlesResponse = { + posts: T; +}; + +export type CommentsResponse = { + comments: T; +}; + +export type ThematicResponse = { + thematic: T; +}; + +export type ThematicsResponse = { + thematics: T; +}; + +export type TopicResponse = { + topic: T; +}; + +export type TopicsResponse = { + topics: T; +}; + +export type EdgesResponse = { + edges: GraphQLEdges[]; + pageInfo: GraphQLPageInfo; +}; + +export type EndCursorResponse = { + pageInfo: Pick; +}; + +export type QueriesResponseMap = { + [articleBySlugQuery]: ArticleResponse; + [articlesCardQuery]: ArticlesResponse>; + [articlesEndCursorQuery]: ArticlesResponse; + [articlesQuery]: ArticlesResponse>; + [articlesSlugQuery]: ArticlesResponse>; + [commentsQuery]: CommentsResponse>; + [thematicBySlugQuery]: ThematicResponse; + [thematicsListQuery]: ThematicsResponse>; + [thematicsSlugQuery]: ThematicsResponse>; + [topicBySlugQuery]: TopicResponse; + [topicsListQuery]: TopicsResponse>; + [topicsSlugQuery]: TopicsResponse>; + [totalArticlesQuery]: ArticlesResponse; + [totalThematicsQuery]: ThematicsResponse; + [totalTopicsQuery]: TopicsResponse; +}; + +//=========================================================================== +// Queries input types +//=========================================================================== + +export type QueryEdges = Pick; + +export type ContentId = { + contentId: number; +}; + +export type Search = { + search?: string; +}; + +export type QueriesInputMap = { + [articleBySlugQuery]: Slug; + [articlesCardQuery]: QueryEdges & Search; + [articlesEndCursorQuery]: QueryEdges & Search; + [articlesQuery]: QueryEdges & Search; + [articlesSlugQuery]: QueryEdges & Search; + [commentsQuery]: ContentId; + [thematicBySlugQuery]: Slug; + [thematicsListQuery]: QueryEdges & Search; + [thematicsSlugQuery]: QueryEdges & Search; + [topicBySlugQuery]: Slug; + [topicsListQuery]: QueryEdges & Search; + [topicsSlugQuery]: QueryEdges & Search; + [totalArticlesQuery]: Search; + [totalThematicsQuery]: null; + [totalTopicsQuery]: null; +}; + +export type CommentPage = { + comments: RawComment[]; + hasNextPage: boolean; + endCursor: string; +}; -- cgit v1.2.3