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

package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@jeromefitz/conventional-gitmoji": "4.0.5",
-    "@jeromefitz/eslint-config": "5.0.0-canary.3",
+    "@jeromefitz/eslint-config": "5.0.0-canary.4",
     "@jeromefitz/lint-staged": "2.0.4",
     "@jeromefitz/prettier-config": "2.0.8",
     "@jeromefitz/release-notes-generator": "3.0.4",

packages/design-system/src/components/Icon/Icon.stories.tsx

@@ -14,8 +14,8 @@ export default meta
 type Story = StoryObj<typeof meta>
 
 export const Default: Story = {
-  argTypes: {},
   args: {
     className: cx(),
   },
+  argTypes: {},
 }

packages/design-system/src/components/Icon/Icon.tsx

@@ -1080,9 +1080,9 @@ export {
   ArrowUturnLeftIcon,
   BellIcon,
   BlueskyLogoIcon,
-  BookOpenIcon,
   BookmarkFilledIcon,
   BookmarkIcon,
+  BookOpenIcon,
   CalendarIcon,
   CameraIcon,
   CaretDownIcon,

packages/design-system/src/components/Icon/index.ts

@@ -13,9 +13,9 @@ import {
   ArrowUturnLeftIcon,
   BellIcon,
   BlueskyLogoIcon,
-  BookOpenIcon,
   BookmarkFilledIcon,
   BookmarkIcon,
+  BookOpenIcon,
   CalendarIcon,
   CameraIcon,
   CaretDownIcon,

packages/next-notion/src/Notion.Blocks.tsx

@@ -4,7 +4,7 @@ import type {
 } from '@notionhq/client/build/src/api-endpoints.js'
 // import { Suspense } from 'react'
 
-import { OBJECTS, TYPES, blocks as blocksDefault } from './Notion.Config'
+import { blocks as blocksDefault, OBJECTS, TYPES } from './Notion.Config'
 import { getBlock } from './Notion.utils'
 
 function NotionBlocks({
@@ -14,7 +14,7 @@ function NotionBlocks({
   // @todo(types) ListBlockChildrenResponse | any => children
   blocks?: any
   // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-  data: ListBlockChildrenResponse | any
+  data: any | ListBlockChildrenResponse
 }) {
   const { object, results, type } = data
   const isListBlock = object === OBJECTS.LIST && type === TYPES.BLOCK

packages/next-notion/src/Notion.Config.tsx

@@ -116,4 +116,4 @@ const blocks = {
   },
 }
 
-export { OBJECTS, TYPES, blocks }
+export { blocks, OBJECTS, TYPES }

packages/next-notion/src/Notion.types.ts

@@ -1,3 +1,4 @@
+/* eslint-disable perfectionist/sort-union-types */
 import type {
   BlockObjectResponse,
   PartialUserObjectResponse,
@@ -40,9 +41,9 @@ type Id<T> = T extends infer U ? { [K in keyof U]: U[K] } : never
 
 type SpreadTwo<L, R> = Id<
   Pick<L, Exclude<keyof L, keyof R>> &
-    Pick<R, Exclude<OptionalPropertyNames<R>, keyof L>> &
     Pick<R, Exclude<keyof R, OptionalPropertyNames<R>>> &
-    SpreadProperties<L, R, OptionalPropertyNames<R> & keyof L>
+    Pick<R, Exclude<OptionalPropertyNames<R>, keyof L>> &
+    SpreadProperties<L, R, keyof L & OptionalPropertyNames<R>>
 >
 
 type Spread<A extends readonly [...any]> = A extends [infer L, ...infer R]

packages/next-notion/src/blocks/RichText.tsx

@@ -12,7 +12,7 @@ import type {
   RichTextItemResponse,
 } from '@notionhq/client/build/src/api-endpoints.js'
 
-import { Fragment, forwardRef } from 'react'
+import { forwardRef, Fragment } from 'react'
 
 import type { ApiColor } from '../Notion.types'
 

packages/next-notion/src/queries/getBlockChildrenDataParent.ts

@@ -12,9 +12,9 @@ import { getColumnData } from './getColumnData'
 async function getBlockChildrenDataParent(block_id) {
   const response = await getBlockChildrenData(block_id)
 
-  let isListItemStart = false,
-    isListItemType = '',
-    isListItemId = ''
+  let isListItemId = '',
+    isListItemStart = false,
+    isListItemType = ''
   const blocks: any = []
 
   // response.results.map(async (block: BlockObjectResponse, i) => {

packages/next-notion/src/utils/getPropertyTypeData.ts

@@ -242,7 +242,7 @@ function getRollupData({ data, type }: { data: RollupData; type: string }) {
 
 interface SelectData {
   id: string
-  select: SelectPropertyResponse | null
+  select: null | SelectPropertyResponse
   type: 'select'
 }
 function getSelectData({ data, type }: { data: SelectData; type: string }) {

packages/shared/src/components/Notion/Blocks/Embed.tsx

@@ -4,7 +4,7 @@ import { EmbedTwitter } from './Embed.Twitter'
 
 // @todo(types)
 // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-function EmbedImpl({ block }: { block: BlockObjectResponse | any }) {
+function EmbedImpl({ block }: { block: any | BlockObjectResponse }) {
   // console.dir(`EmbedImpl`)
   // console.dir(block)
 

packages/shared/src/components/Notion/Blocks/Video.tsx

@@ -11,7 +11,7 @@ import { VideoYouTube } from './Video.YouTube'
 
 // @todo(types)
 // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-function VideoImpl({ block }: { block: VideoBlockObjectResponse | any }) {
+function VideoImpl({ block }: { block: any | VideoBlockObjectResponse }) {
   const url = block.video.external.url
 
   /**

packages/shared/src/index.ts

@@ -1,7 +1,7 @@
 export {
-  getDataFromCache,
   getDatabaseQuery,
   getDatabaseQueryByDateRange,
+  getDataFromCache,
   getMetadata,
   getPageDataFromNotion,
   getSegmentInfo,

packages/shared/src/notion/utils/index.ts

@@ -1,6 +1,6 @@
-export { getDataFromCache } from './getDataFromCache'
 export { getDatabaseQuery } from './getDatabaseQuery'
 export { getDatabaseQueryByDateRange } from './getDatabaseQueryByDateRange'
+export { getDataFromCache } from './getDataFromCache'
 export { getMetadata } from './getMetadata'
 export { getPageDataFromNotion } from './getPageDataFromNotion'
 export { getSegmentInfo } from './getSegmentInfo'

packages/shared/src/redis/setCache.ts

@@ -9,7 +9,7 @@ import redis, { getKey } from './index'
 
 // @todo(types) any
 // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-function setCache({ data, slug }: { data: RC | any; slug: string }) {
+function setCache({ data, slug }: { data: any | RC; slug: string }) {
   const key = getKey(slug)
   void redis.set(key, stringify(data), {
     ex: TIME.MONTH,