Replaced Exclude with NonNullable

src/components/Library/ContentLine.tsx

@@ -7,15 +7,12 @@ import { Immutable } from "helpers/types";
 import { useState } from "react";
 
 interface Props {
-  content: Exclude<
+  content: NonNullable<
-    Exclude<
+    NonNullable<
-      Exclude<
+      NonNullable<
-        GetLibraryItemQuery["libraryItems"],
+        GetLibraryItemQuery["libraryItems"]
-        null | undefined
+      >["data"][number]["attributes"]
-      >["data"][number]["attributes"],
+    >["contents"]
-      null | undefined
-    >["contents"],
-    null | undefined
   >["data"][number];
   parentSlug: string;
   langui: AppStaticProps["langui"];
@@ -43,7 +40,8 @@ export function ContentLine(props: Immutable<Props>): JSX.Element {
                 ? prettyinlineTitle(
                     content.attributes.content.data.attributes.translations[0]
                       ?.pre_title,
-                    content.attributes.content.data.attributes.translations[0]?.title,
+                    content.attributes.content.data.attributes.translations[0]
+                      ?.title,
                     content.attributes.content.data.attributes.translations[0]
                       ?.subtitle
                   )

src/components/Library/ScanSet.tsx

@@ -13,38 +13,29 @@ import { useSmartLanguage } from "hooks/useSmartLanguage";
 
 interface Props {
   openLightBox: (images: string[], index?: number) => void;
-  scanSet: Exclude<
+  scanSet: NonNullable<
-    Exclude<
+    NonNullable<
-      Exclude<
+      NonNullable<
-        Exclude<
+        NonNullable<
-          Exclude<
+          NonNullable<
-            GetLibraryItemScansQuery["libraryItems"],
+            GetLibraryItemScansQuery["libraryItems"]
-            null | undefined
+          >["data"][number]["attributes"]
-          >["data"][number]["attributes"],
+        >["contents"]
-          null | undefined
+      >["data"][number]["attributes"]
-        >["contents"],
+    >["scan_set"]
-        null | undefined
-      >["data"][number]["attributes"],
-      null | undefined
-    >["scan_set"],
-    null | undefined
   >;
   slug: string;
   title: string;
   languages: AppStaticProps["languages"];
   langui: AppStaticProps["langui"];
-  content: Exclude<
+  content: NonNullable<
-    Exclude<
+    NonNullable<
-      Exclude<
+      NonNullable<
-        Exclude<
+        NonNullable<
-          GetLibraryItemScansQuery["libraryItems"],
+          GetLibraryItemScansQuery["libraryItems"]
-          null | undefined
+        >["data"][number]["attributes"]
-        >["data"][number]["attributes"],
+      >["contents"]
-        null | undefined
+    >["data"][number]["attributes"]
-      >["contents"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
   >["content"];
 }
 
@@ -57,7 +48,7 @@ export function ScanSet(props: Immutable<Props>): JSX.Element {
     languages: languages,
     languageExtractor: (item) => item.language?.data?.attributes?.code,
     transform: (item) => {
-      const newItem = { ...item } as Exclude<Props["scanSet"][number], null>;
+      const newItem = { ...item } as NonNullable<Props["scanSet"][number]>;
       newItem.pages?.data.sort((a, b) => {
         if (a.attributes?.url && b.attributes?.url) {
           let aName = getAssetFilename(a.attributes.url);

src/components/Library/ScanSetCover.tsx

@@ -14,15 +14,12 @@ import { useSmartLanguage } from "hooks/useSmartLanguage";
 
 interface Props {
   openLightBox: (images: string[], index?: number) => void;
-  images: Exclude<
+  images: NonNullable<
-    Exclude<
+    NonNullable<
-      Exclude<
+      NonNullable<
-        GetLibraryItemScansQuery["libraryItems"],
+        GetLibraryItemScansQuery["libraryItems"]
-        null | undefined
+      >["data"][number]["attributes"]
-      >["data"][number]["attributes"],
+    >["images"]
-      null | undefined
-    >["images"],
-    null | undefined
   >;
   languages: AppStaticProps["languages"];
   langui: AppStaticProps["langui"];

src/components/ThumbnailHeader.tsx

@@ -14,19 +14,11 @@ interface Props {
   title: string | null | undefined;
   subtitle?: string | null | undefined;
   description?: string | null | undefined;
-  type?: Exclude<
+  type?: NonNullable<
-    Exclude<
+    NonNullable<GetContentTextQuery["contents"]>["data"][number]["attributes"]
-      GetContentTextQuery["contents"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
   >["type"];
-  categories?: Exclude<
+  categories?: NonNullable<
-    Exclude<
+    NonNullable<GetContentTextQuery["contents"]>["data"][number]["attributes"]
-      GetContentTextQuery["contents"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
   >["categories"];
   thumbnail?: UploadImageFragment | null | undefined;
   langui: AppStaticProps["langui"];

src/components/Wiki/Chronology/ChronologyItemComponent.tsx

@@ -9,10 +9,7 @@ import { getStatusDescription } from "helpers/others";
 import { Immutable } from "helpers/types";
 
 interface Props {
-  item: Exclude<
+  item: NonNullable<GetChronologyItemsQuery["chronologyItems"]>["data"][number];
-    GetChronologyItemsQuery["chronologyItems"],
-    null | undefined
-  >["data"][number];
   displayYear: boolean;
   langui: AppStaticProps["langui"];
 }

src/components/Wiki/Chronology/ChronologyYearComponent.tsx

@@ -5,9 +5,8 @@ import { Immutable } from "helpers/types";
 
 interface Props {
   year: number;
-  items: Exclude<
+  items: NonNullable<
-    GetChronologyItemsQuery["chronologyItems"],
+    GetChronologyItemsQuery["chronologyItems"]
-    null | undefined
   >["data"][number][];
   langui: AppStaticProps["langui"];
 }

src/graphql/getAppStaticProps.ts

@@ -8,18 +8,13 @@ import { Immutable } from "helpers/types";
 import { GetStaticPropsContext } from "next";
 
 export type AppStaticProps = Immutable<{
-  langui: Exclude<
+  langui: NonNullable<
-    Exclude<
+    NonNullable<
-      GetWebsiteInterfaceQuery["websiteInterfaces"],
+      GetWebsiteInterfaceQuery["websiteInterfaces"]
-      null | undefined
+    >["data"][number]["attributes"]
-    >["data"][number]["attributes"],
-    null | undefined
   >;
-  currencies: Exclude<
+  currencies: NonNullable<GetCurrenciesQuery["currencies"]>["data"];
-    GetCurrenciesQuery["currencies"],
+  languages: NonNullable<GetLanguagesQuery["languages"]>["data"];
-    null | undefined
-  >["data"];
-  languages: Exclude<GetLanguagesQuery["languages"], null | undefined>["data"];
 }>;
 
 export async function getAppStaticProps(

src/helpers/numbers.ts

@@ -4,7 +4,7 @@ import { Immutable } from "./types";
 export function convertPrice(
   pricePicker: Immutable<PricePickerFragment>,
   targetCurrency: Immutable<
-    Exclude<GetCurrenciesQuery["currencies"], null | undefined>["data"][number]
+    NonNullable<GetCurrenciesQuery["currencies"]>["data"][number]
   >
 ): number {
   if (

src/helpers/others.ts

@@ -7,19 +7,15 @@ import { AppStaticProps } from "../graphql/getAppStaticProps";
 import { Immutable } from "./types";
 
 type SortContentProps =
-  | Exclude<
+  | NonNullable<
-      Exclude<
+      NonNullable<
-        GetLibraryItemQuery["libraryItems"],
+        GetLibraryItemQuery["libraryItems"]
-        null | undefined
+      >["data"][number]["attributes"]
-      >["data"][number]["attributes"],
-      null | undefined
     >["contents"]
-  | Exclude<
+  | NonNullable<
-      Exclude<
+      NonNullable<
-        GetLibraryItemScansQuery["libraryItems"],
+        GetLibraryItemScansQuery["libraryItems"]
-        null | undefined
+      >["data"][number]["attributes"]
-      >["data"][number]["attributes"],
-      null | undefined
     >["contents"];
 
 export function sortContent(contents: Immutable<SortContentProps>) {

src/helpers/types.ts

@@ -1,28 +1,20 @@
 import { GetContentTextQuery, GetPostQuery } from "graphql/generated";
 import React from "react";
 
-type Post = Exclude<
+type Post = NonNullable<
-  Exclude<
+  NonNullable<GetPostQuery["posts"]>["data"][number]["attributes"]
-    GetPostQuery["posts"],
-    null | undefined
-  >["data"][number]["attributes"],
-  null | undefined
 >;
 
 export interface PostWithTranslations extends Omit<Post, "translations"> {
-  translations: Exclude<Post["translations"], null | undefined>;
+  translations: NonNullable<Post["translations"]>;
 }
 
-type Content = Exclude<
+type Content = NonNullable<
-  Exclude<
+  NonNullable<GetContentTextQuery["contents"]>["data"][number]["attributes"]
-    GetContentTextQuery["contents"],
-    null | undefined
-  >["data"][number]["attributes"],
-  null | undefined
 >;
 
 export interface ContentWithTranslations extends Omit<Content, "translations"> {
-  translations: Exclude<Content["translations"], null | undefined>;
+  translations: NonNullable<Content["translations"]>;
 }
 
 type ImmutableBlackList<T> = JSX.Element | React.ReactNode | Function;

src/hooks/useSmartLanguage.tsx

@@ -8,12 +8,8 @@ import { useEffect, useMemo, useState } from "react";
 interface Props<T> {
   items: Immutable<T[]>;
   languages: AppStaticProps["languages"];
-  languageExtractor: (
+  languageExtractor: (item: NonNullable<Immutable<T>>) => string | undefined;
-    item: Exclude<Immutable<T>, null | undefined>
+  transform?: (item: NonNullable<Immutable<T>>) => NonNullable<Immutable<T>>;
-  ) => string | undefined;
-  transform?: (
-    item: Exclude<Immutable<T>, null | undefined>
-  ) => Exclude<Immutable<T>, null | undefined>;
 }
 
 function getPreferredLanguage(

src/pages/archives/videos/c/[uid].tsx

@@ -23,9 +23,8 @@ import {
 import { useState } from "react";
 
 interface Props extends AppStaticProps {
-  channel: Exclude<
+  channel: NonNullable<
-    GetVideoChannelQuery["videoChannels"],
+    GetVideoChannelQuery["videoChannels"]
-    null | undefined
   >["data"][number]["attributes"];
 }
 

src/pages/archives/videos/index.tsx

@@ -21,7 +21,7 @@ import { GetStaticPropsContext } from "next";
 import { useState } from "react";
 
 interface Props extends AppStaticProps {
-  videos: Exclude<GetVideosPreviewQuery["videos"], null | undefined>["data"];
+  videos: NonNullable<GetVideosPreviewQuery["videos"]>["data"];
 }
 
 export default function Videos(props: Props): JSX.Element {

src/pages/archives/videos/v/[uid].tsx

@@ -26,12 +26,8 @@ import {
 } from "next";
 
 interface Props extends AppStaticProps {
-  video: Exclude<
+  video: NonNullable<
-    Exclude<
+    NonNullable<GetVideoQuery["videos"]>["data"][number]["attributes"]
-      GetVideoQuery["videos"],
-      null | undefined
-    >["data"][number]["attributes"],
-    null | undefined
   >;
 }
 

src/pages/library/[slug]/index.tsx

@@ -45,13 +45,11 @@ import {
 import { useState } from "react";
 
 interface Props extends AppStaticProps {
-  item: Exclude<
+  item: NonNullable<
-    GetLibraryItemQuery["libraryItems"],
+    GetLibraryItemQuery["libraryItems"]
-    null | undefined
   >["data"][number]["attributes"];
-  itemId: Exclude<
+  itemId: NonNullable<
-    GetLibraryItemQuery["libraryItems"],
+    GetLibraryItemQuery["libraryItems"]
-    null | undefined
   >["data"][number]["id"];
 }
 

src/pages/library/[slug]/scans.tsx

@@ -26,13 +26,11 @@ import {
 } from "next";
 
 interface Props extends AppStaticProps {
-  item: Exclude<
+  item: NonNullable<
-    GetLibraryItemScansQuery["libraryItems"],
+    GetLibraryItemScansQuery["libraryItems"]
-    null | undefined
   >["data"][number]["attributes"];
-  itemId: Exclude<
+  itemId: NonNullable<
-    GetLibraryItemScansQuery["libraryItems"],
+    GetLibraryItemScansQuery["libraryItems"]
-    null | undefined
   >["data"][number]["id"];
 }
 

src/pages/library/index.tsx

@@ -23,10 +23,7 @@ import { GetStaticPropsContext } from "next";
 import { useEffect, useState } from "react";
 
 interface Props extends AppStaticProps {
-  items: Exclude<
+  items: NonNullable<GetLibraryItemsPreviewQuery["libraryItems"]>["data"];
-    GetLibraryItemsPreviewQuery["libraryItems"],
-    null | undefined
-  >["data"];
 }
 
 type GroupLibraryItems = Map<string, Immutable<Props["items"]>>;

src/pages/news/index.tsx

@@ -16,7 +16,7 @@ import { GetStaticPropsContext } from "next";
 import { useState } from "react";
 
 interface Props extends AppStaticProps {
-  posts: Exclude<GetPostsPreviewQuery["posts"], null | undefined>["data"];
+  posts: NonNullable<GetPostsPreviewQuery["posts"]>["data"];
 }
 
 export default function News(props: Immutable<Props>): JSX.Element {

src/pages/wiki/chronology.tsx

@@ -16,14 +16,10 @@ import { prettySlug } from "helpers/formatters";
 import { GetStaticPropsContext } from "next";
 
 interface Props extends AppStaticProps {
-  chronologyItems: Exclude<
+  chronologyItems: NonNullable<
-    GetChronologyItemsQuery["chronologyItems"],
+    GetChronologyItemsQuery["chronologyItems"]
-    null | undefined
-  >["data"];
-  chronologyEras: Exclude<
-    GetErasQuery["chronologyEras"],
-    null | undefined
   >["data"];
+  chronologyEras: NonNullable<GetErasQuery["chronologyEras"]>["data"];
 }
 
 export default function Chronology(props: Props): JSX.Element {