⬆️ (deps) [email protected] 🚨 format [skip ci] (#2666)

- [x] upgrade to canary build - [x] apply fixes
JeromeFitz · Jul 23, 2024 · 58972c7 · 58972c7
1 parent e32c80a
commit 58972c7
Show file tree

Hide file tree

Showing 62 changed files with 497 additions and 345 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@jeromefitz/conventional-gitmoji": "4.0.4",
-    "@jeromefitz/eslint-config": "4.0.2",
+    "@jeromefitz/eslint-config": "5.0.0-canary.3",
     "@jeromefitz/lint-staged": "2.0.4",
     "@jeromefitz/prettier-config": "2.0.8",
     "@jeromefitz/release-notes-generator": "3.0.3",

diff --git a/packages/design-system/src/components/Callout/Callout.tsx b/packages/design-system/src/components/Callout/Callout.tsx
@@ -10,7 +10,7 @@ import {
 import { cx } from '../../utils/cx'
 import { FileTextIcon } from '../Icon/index'
 
-type AdditionalProps = {
+interface AdditionalProps {
   children?: ReactNode
   className?: string
   classNameText?: string

diff --git a/packages/next-notion/src/Notion.constants.ts b/packages/next-notion/src/Notion.constants.ts
@@ -3,6 +3,7 @@ import ms from 'ms'
 /**
  * @redis is in seconds not ms
  */
+// eslint-disable-next-line no-constant-binary-expression
 const getTimeInSeconds = (time: number) => time / 1000 ?? 0
 
 /**

diff --git a/packages/next-notion/src/Notion.types.ts b/packages/next-notion/src/Notion.types.ts
@@ -52,7 +52,7 @@ type Spread<A extends readonly [...any]> = A extends [infer L, ...infer R]
  *
  */
 type Direction = 'ascending' | 'descending'
-type SortItem = {
+interface SortItem {
   direction: Direction
   property: string
 }
@@ -64,7 +64,7 @@ type FilterType =
   | 'equals'
   | 'starts_with'
 
-type BulletedListBlockObjectResponse = {
+interface BulletedListBlockObjectResponse {
   archived: boolean
   bulleted_list: any
   created_by: PartialUserObjectResponse
@@ -81,7 +81,7 @@ type BulletedListBlockObjectResponse = {
     | { type: 'workspace'; workspace: true }
   type: 'bulleted_list'
 }
-type NumberedListBlockObjectResponse = {
+interface NumberedListBlockObjectResponse {
   archived: boolean
   created_by: PartialUserObjectResponse
   created_time: string
@@ -142,7 +142,7 @@ type SelectColor =
   | 'purple'
   | 'red'
   | 'yellow'
-type SelectPropertyResponse = {
+interface SelectPropertyResponse {
   color: SelectColor
   id: StringRequest
   name: StringRequest
@@ -741,7 +741,7 @@ type TimeZoneRequest =
   | 'W-SU'
   | 'WET'
   | 'Zulu'
-type DateResponse = {
+interface DateResponse {
   end: null | string
   start: string
   time_zone: TimeZoneRequest | null

diff --git a/packages/next-notion/src/blocks/Emoji.client.tsx b/packages/next-notion/src/blocks/Emoji.client.tsx
@@ -73,6 +73,7 @@ async function EmojiWrapper({ id, text }) {
   // isDev && console.dir(`> lazy load emoji libraries`)
 
   let emojiIndex = 0
+  // eslint-disable-next-line no-unsafe-optional-chaining
   for (const match of text?.matchAll(regex)) {
     const emoji = match[0]
     // @note(emoji) double to take into account emoji codepoint length

diff --git a/packages/next-notion/src/blocks/Emoji.server.tsx b/packages/next-notion/src/blocks/Emoji.server.tsx
@@ -71,6 +71,7 @@ function EmojiWrapper({ id, text }) {
   // isDev && console.dir(`> lazy load emoji libraries`)
 
   let emojiIndex = 0
+  // eslint-disable-next-line no-unsafe-optional-chaining
   for (const match of text?.matchAll(regex)) {
     const emoji = match[0]
     // @note(emoji) double to take into account emoji codepoint length

diff --git a/packages/next-notion/src/blocks/RichText.tsx b/packages/next-notion/src/blocks/RichText.tsx
@@ -65,7 +65,7 @@ function RichTextArray({ id, items }) {
           )
         }
 
-        const Component = !!props.className ? 'span' : Fragment
+        const Component = props.className ? 'span' : Fragment
         if (Component === Fragment) delete props.className
 
         return (
@@ -97,7 +97,7 @@ function RichText({
   const key = getBlockKey(block.id, block.type, order)
   const data: {
     color: ApiColor
-    rich_text: Array<RichTextItemResponse>
+    rich_text: RichTextItemResponse[]
   } = block[block.type]
 
   if (!data) return null

diff --git a/packages/next-notion/src/queries/getDatabaseQuery.ts b/packages/next-notion/src/queries/getDatabaseQuery.ts
@@ -13,7 +13,7 @@ import { notion } from '../helper'
 
 const DATABASE_ID = envServer.NOTION__DATABASE__PAGES ?? ''
 
-type GetDatabaseQueryTypes = {
+interface GetDatabaseQueryTypes {
   database_id?: string
   filterType?: FilterType
   segmentInfo: SegmentInfo
@@ -70,7 +70,7 @@ const getDatabaseQuery = async ({
   const sorts = sortsData
 
   const options = {
-    database_id: !!database_id ? database_id : DATABASE_ID,
+    database_id: database_id ? database_id : DATABASE_ID,
     filter,
     page_size: 100, // max
     sorts,
@@ -172,7 +172,7 @@ const getDatabaseQueryByDateRange = async ({
   const sorts = sortsData
 
   const options = {
-    database_id: !!database_id ? database_id : DATABASE_ID,
+    database_id: database_id ? database_id : DATABASE_ID,
     filter,
     sorts,
   }

diff --git a/packages/next-notion/src/utils/getPropertyTypeData.ts b/packages/next-notion/src/utils/getPropertyTypeData.ts
@@ -31,7 +31,7 @@ import type {
   SelectPropertyResponse,
 } from '../Notion.types'
 
-type CheckboxData = {
+interface CheckboxData {
   checkbox: boolean
   id: string
   type: 'checkbox'
@@ -43,7 +43,7 @@ function getCheckboxData({ data, type }: { data: CheckboxData; type: string }) {
   return dataReturn
 }
 
-type DateData = {
+interface DateData {
   date: DateResponse | null
   id: string
   type: 'date'
@@ -57,7 +57,7 @@ function getDateData({ data, type }: { data: DateData; type: string }) {
   return dataReturn
 }
 
-type FilesData = {
+interface FilesData {
   id: string
   type: 'url'
   url: null | string
@@ -89,9 +89,9 @@ function getFormulaData({ data, type }: { data: any; type: string }) {
   return dataReturn[dataReturn.type]
 }
 
-type MultiSelectData = {
+interface MultiSelectData {
   id: string
-  multi_select: Array<SelectPropertyResponse>
+  multi_select: SelectPropertyResponse[]
   type: 'multi_select'
 }
 function getMultiSelectData({
@@ -107,7 +107,7 @@ function getMultiSelectData({
   return dataReturn
 }
 
-type NumberData = {
+interface NumberData {
   id: string
   number: null | number
   type: 'number'
@@ -119,12 +119,12 @@ function getNumberData({ data, type }: { data: NumberData; type: string }) {
   return dataReturn
 }
 
-type RelationData = {
+interface RelationData {
   has_more?: boolean
   id: string
-  relation: Array<{
+  relation: {
     id: string
-  }>
+  }[]
   type: 'relation'
 }
 function getRelationData({ data, type }: { data: RelationData; type: string }) {
@@ -134,12 +134,12 @@ function getRelationData({ data, type }: { data: RelationData; type: string }) {
   return dataReturn
 }
 
-type RichTextData = {
+interface RichTextData {
   has_more?: boolean
   id: string
-  relation: Array<{
+  relation: {
     id: string
-  }>
+  }[]
   type: 'relation'
 }
 function getRichTextData({ data, type }: { data: RichTextData; type: string }) {
@@ -158,12 +158,12 @@ function getRichTextData({ data, type }: { data: RichTextData; type: string }) {
   return dataReturn
 }
 
-type RollupData = {
+interface RollupData {
   id: string
   object: 'property_item'
   rollup:
     | {
-        array: Array<EmptyObject>
+        array: EmptyObject[]
         function: RollupFunction
         type: 'array'
       }
@@ -240,7 +240,7 @@ function getRollupData({ data, type }: { data: RollupData; type: string }) {
   return dataReturn
 }
 
-type SelectData = {
+interface SelectData {
   id: string
   select: SelectPropertyResponse | null
   type: 'select'
@@ -252,9 +252,9 @@ function getSelectData({ data, type }: { data: SelectData; type: string }) {
   return dataReturn
 }
 
-type TitleData = {
+interface TitleData {
   id: string
-  title: Array<RichTextItemResponse>
+  title: RichTextItemResponse[]
   type: 'title'
 }
 function getTitleData({ data, type }: { data: TitleData; type: string }) {
@@ -265,7 +265,7 @@ function getTitleData({ data, type }: { data: TitleData; type: string }) {
   return dataReturn
 }
 
-type UrlData = {
+interface UrlData {
   id: string
   type: 'url'
   url: null | string

diff --git a/packages/next-notion/src/utils/getSegmentInfo.ts b/packages/next-notion/src/utils/getSegmentInfo.ts
@@ -2,7 +2,7 @@ import _first from 'lodash/first.js'
 import _isInteger from 'lodash/isInteger.js'
 import _last from 'lodash/last.js'
 
-type SegmentInfo = {
+interface SegmentInfo {
   catchAll: string[]
   hasMeta: boolean
   isIndex: boolean
@@ -14,6 +14,7 @@ type SegmentInfo = {
 function getSegmentInfo({ SEGMENT, ...props }) {
   const segment = SEGMENT
   const catchAll = [segment]
+  // eslint-disable-next-line no-unsafe-optional-chaining
   !!props.params?.catchAll && catchAll.push(...props.params?.catchAll)
 
   const first = _first(catchAll)

diff --git a/packages/shared/src/components/Navigation/Navigation.tsx b/packages/shared/src/components/Navigation/Navigation.tsx
@@ -1,4 +1,4 @@
-function Navigation({}) {
+function Navigation() {
   return (
     <>
       <></>

diff --git a/packages/shared/src/components/Notion/Blocks/Embed.Twitter.tsx b/packages/shared/src/components/Notion/Blocks/Embed.Twitter.tsx
@@ -19,7 +19,7 @@ function EmbedTwitter({ block }) {
   /**
    * @todo(notion) TextAnnotations
    */
-  const caption = !!block[block.type]?.caption
+  const caption = block[block.type]?.caption
     ? block[block.type]?.caption[0]?.plain_text
     : null
 

diff --git a/packages/shared/src/components/Notion/Blocks/Image.tsx b/packages/shared/src/components/Notion/Blocks/Image.tsx
@@ -73,7 +73,7 @@ async function getImageFromBlock({ block, url }) {
 
   const cache: any = await redis.get(key)
   const isCached = !!cache && !isObjectEmpty(cache)
-  let image = !!cache ? { ...cache } : {}
+  let image = cache ? { ...cache } : {}
 
   /**
    * @note(notion) AWS, Notion, and Cache
@@ -175,7 +175,7 @@ async function ImageImpl({
   const imageUrl = getImageUrl(block)
   if (!imageUrl) return null
 
-  const imageCaption = !!block[block.type]?.caption
+  const imageCaption = block[block.type]?.caption
     ? block[block.type]?.caption[0]?.plain_text
     : null
 

diff --git a/packages/shared/src/components/Notion/Blocks/Image.utils.ts b/packages/shared/src/components/Notion/Blocks/Image.utils.ts
@@ -10,7 +10,7 @@ function getImageAlt(comments) {
   )
   return !!c && c.length > 0
     ? c[0]?.rich_text[0]?.plain_text.slice(FIND_ALT.length)
-    : !!comment
+    : comment
       ? comment?.rich_text[0]?.plain_text
       : ''
 }

diff --git a/packages/shared/src/components/Notion/Blocks/Video.tsx b/packages/shared/src/components/Notion/Blocks/Video.tsx
@@ -17,7 +17,7 @@ function VideoImpl({ block }: { block: VideoBlockObjectResponse | any }) {
   /**
    * @todo(notion) TextAnnotations
    */
-  const caption = !!block[block.type]?.caption
+  const caption = block[block.type]?.caption
     ? block[block.type]?.caption[0]?.plain_text
     : null
 

diff --git a/packages/shared/src/hooks/useSWRInfinitePages.ts b/packages/shared/src/hooks/useSWRInfinitePages.ts
@@ -21,7 +21,7 @@ type PageKeyMaker<Page, Key extends any[]> = (
    */
 ) => Key
 
-type UseSWRInfinitePagesConfig<Page extends object> = {
+interface UseSWRInfinitePagesConfig<Page extends object> {
   dataPath: keyof Page | string[]
   limit?: number
 } // & SWRInfiniteConfiguration<Page>

diff --git a/packages/shared/src/lib/constants.ts b/packages/shared/src/lib/constants.ts
@@ -3,6 +3,7 @@ import ms from 'ms'
 /**
  * @redis is in seconds not ms
  */
+// eslint-disable-next-line no-constant-binary-expression
 const getTimeInSeconds = (time: number) => time / 1000 ?? 0
 
 /**

diff --git a/packages/shared/src/notion/utils/getDataFromCache.ts b/packages/shared/src/notion/utils/getDataFromCache.ts
@@ -22,7 +22,7 @@ import { getDatabaseQuery, getMetadata } from './index'
 
 const notion = new Client({ auth: envServer.NOTION_API_KEY })
 
-type GetDataFromCache = {
+interface GetDataFromCache {
   database_id: string
   draft?: boolean
   filterType: any //FilterType
@@ -84,7 +84,7 @@ const getDataFromCache = cache(
       const page = data.results[0]
 
       let blocks = {}
-      if (!!page) {
+      if (page) {
         const blockChildrenParentData = getBlockChildrenDataParent(page?.id)
         const [blockChildrenParent] = await Promise.all([blockChildrenParentData])
         blocks = blockChildrenParent
@@ -114,7 +114,7 @@ const getDataFromCache = cache(
      */
     let isExpired = false
     const blockSeoImage = data?.page?.properties['SEO.Image']?.files[0]
-    const SEO_IMAGE_IS_AWS = !!blockSeoImage
+    const SEO_IMAGE_IS_AWS = blockSeoImage
       ? isAwsImage(blockSeoImage[blockSeoImage?.type]?.url)
       : false
     if (SEO_IMAGE_IS_AWS) {
@@ -131,7 +131,7 @@ const getDataFromCache = cache(
      */
     if (
       !!data?.page?.id &&
-      (isExpired || isObjectEmpty(!!data?.seo ? data?.seo : {}))
+      (isExpired || isObjectEmpty(data?.seo ? data?.seo : {}))
     ) {
       // @todo(types)
       const pageData: any = await notion?.pages?.retrieve({