From e22d20972174b2994195cd91b0aa9342c9ba7c00 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 28 Dec 2022 09:16:44 +0800 Subject: [PATCH] Fix test --- packages/api/src/generated/graphql.ts | 4 ++-- packages/api/src/generated/schema.graphql | 4 ++-- packages/api/src/readability.d.ts | 8 ++++---- packages/api/src/schema.ts | 4 ++-- packages/api/src/services/save_page.ts | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 0c26798f8..a8a6b2f84 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1621,8 +1621,8 @@ export type ParseResult = { length: Scalars['Int']; previewImage?: InputMaybe; publishedDate?: InputMaybe; - siteIcon?: InputMaybe; - siteName?: InputMaybe; + siteIcon: Scalars['String']; + siteName: Scalars['String']; textContent: Scalars['String']; title: Scalars['String']; }; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 7d4df8a16..980d19cdf 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -1178,8 +1178,8 @@ input ParseResult { length: Int! previewImage: String publishedDate: Date - siteIcon: String - siteName: String + siteIcon: String! + siteName: String! textContent: String! title: String! } diff --git a/packages/api/src/readability.d.ts b/packages/api/src/readability.d.ts index 2587b114e..cd2504047 100644 --- a/packages/api/src/readability.d.ts +++ b/packages/api/src/readability.d.ts @@ -161,11 +161,11 @@ declare module '@omnivore/readability' { /** Article site icon */ siteIcon: string /** Article preview image */ - previewImage?: string + previewImage?: string | null /** Article published date */ - publishedDate?: Date - dom?: Element - language?: string + publishedDate?: Date | null + dom?: Element | null + language?: string | null } } diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index 9a17cf019..14abca849 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -534,8 +534,8 @@ const schema = gql` textContent: String! length: Int! excerpt: String! - siteName: String - siteIcon: String + siteName: String! + siteIcon: String! previewImage: String publishedDate: Date language: String diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts index de1d18168..5ecc88f18 100644 --- a/packages/api/src/services/save_page.ts +++ b/packages/api/src/services/save_page.ts @@ -233,8 +233,8 @@ export const parsedContentToPage = ({ }), pageType, hash: uploadFileHash || stringToHash(parsedContent?.content || url), - image: parsedContent?.previewImage, - publishedAt: validatedDate(parsedContent?.publishedDate), + image: parsedContent?.previewImage ?? undefined, + publishedAt: validatedDate(parsedContent?.publishedDate ?? undefined), uploadFileId: uploadFileId, readingProgressPercent: 0, readingProgressAnchorIndex: 0, @@ -242,7 +242,7 @@ export const parsedContentToPage = ({ createdAt: saveTime || new Date(), savedAt: saveTime || new Date(), siteName: parsedContent?.siteName, - language: parsedContent?.language, + language: parsedContent?.language ?? undefined, siteIcon: parsedContent?.siteIcon, wordsCount: wordsCount(parsedContent?.textContent || ''), }