chore(lint): make eslint run, fix errors

Closes #9316
keystonejs · Oct 11, 2024 · ce46446 · ce46446
1 parent dac5d5d
commit ce46446
Show file tree

Hide file tree

Showing 28 changed files with 152 additions and 63 deletions.
diff --git a/design-system/packages/core/src/components/Link.tsx b/design-system/packages/core/src/components/Link.tsx
@@ -5,7 +5,7 @@ import { jsx } from '../emotion'
 import { useTheme } from '../theme'
 import { forwardRefWithAs } from '../utils'
 
-export const Link = forwardRefWithAs<'a', {}>(({ as: Tag = 'a', ...props }, ref) => {
+export const Link = forwardRefWithAs<'a', unknown>(({ as: Tag = 'a', ...props }, ref) => {
   const { typography, colors } = useTheme()
 
   const styles = {

diff --git a/design-system/packages/fields/src/FieldContainer.tsx b/design-system/packages/fields/src/FieldContainer.tsx
@@ -2,6 +2,6 @@
 /** @jsx jsx */
 import { jsx, forwardRefWithAs } from '@keystone-ui/core'
 
-export const FieldContainer = forwardRefWithAs<'div', {}>(({ as: Tag = 'div', ...props }, ref) => {
+export const FieldContainer = forwardRefWithAs<'div', unknown>(({ as: Tag = 'div', ...props }, ref) => {
   return <Tag ref={ref} {...props} />
 })
diff --git a/eslint.config.js → eslint.config.mjs b/eslint.config.js → eslint.config.mjs
@@ -1,23 +1,28 @@
 // @ts-check
 
-const eslint = require('@eslint/js')
-const tseslint = require('typescript-eslint')
+import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
+import stylisticTs from '@stylistic/eslint-plugin-ts'
 
-module.exports = tseslint.config(
+export default tseslint.config(
   {
     ignores: [
       '**/.keystone/',
+      '**/.next/',
       '**/dist/',
+      '**/__generated__/',
       '**/node_modules/',
       '**/syntax-error.js',
       '**/public/',
-      'examples/extend-graphql-schema-nexus/nexus-types.ts'
+      'examples/',
     ],
   },
   eslint.configs.recommended,
   ...tseslint.configs.strict,
-//    ...tseslint.configs.stylistic,
   {
+    plugins: {
+      '@stylistic/ts': stylisticTs,
+    },
     rules: {
       // TODO: remove
       'no-empty': 'off',
@@ -50,7 +55,7 @@ module.exports = tseslint.config(
       'space-before-blocks': ['error', 'always'],
       'space-before-function-paren': ['error', 'always'],
       'space-in-parens': ['error', 'never'],
-      '@typescript-eslint/member-delimiter-style': [
+      '@stylistic/ts/member-delimiter-style': [
         'error',
         {
           multiline: { delimiter: 'none' },
@@ -64,7 +69,7 @@ module.exports = tseslint.config(
       }],
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/prefer-ts-expect-error': 'error',
-      '@typescript-eslint/semi': ['error', 'never'],
+      '@stylistic/ts/semi': ['error', 'never'],
     }
   }
 )
diff --git a/package.json b/package.json
@@ -15,6 +15,8 @@
     "test:types": "tsc",
     "test:debug": "node --inspect-brk ./node_modules/.bin/jest",
     "test:admin-ui": "jest tests/admin-ui-tests",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
     "build": "preconstruct build",
     "prepare": "preconstruct dev"
   },
@@ -30,6 +32,7 @@
     "@changesets/get-release-plan": "^4.0.0",
     "@eslint/js": "^9.2.0",
     "@preconstruct/cli": "2.8.8",
+    "@stylistic/eslint-plugin-ts": "^2.9.0",
     "@types/jest": "^29.0.0",
     "@types/node": "^20.0.0",
     "@types/node-fetch": "^2.5.12",

diff --git a/packages/auth/src/components/Icons.tsx b/packages/auth/src/components/Icons.tsx
@@ -64,7 +64,7 @@ export const IconGithub = (props: any) => (
 // Misc
 // ==============================
 
-const A11yText = forwardRefWithAs<'span', {}>(({ as: Tag = 'span', ...props }, ref) => (
+const A11yText = forwardRefWithAs<'span', unknown>(({ as: Tag = 'span', ...props }, ref) => (
   <Tag
     ref={ref}
     css={{

diff --git a/packages/auth/src/schema.ts b/packages/auth/src/schema.ts
@@ -101,7 +101,7 @@ export const getSchemaExtension = ({
     try {
       ast = parse(query)
     } catch (err) {
-      throw new Error( `The query to get session data has a syntax error, the sessionData option in your createAuth usage is likely incorrect\n${err}`)
+      throw new Error(`The query to get session data has a syntax error, the sessionData option in your createAuth usage is likely incorrect\n${err}`)
     }
 
     const errors = validate(base.schema, ast)

diff --git a/packages/core/src/admin-ui/admin-meta-graphql.ts b/packages/core/src/admin-ui/admin-meta-graphql.ts
@@ -128,7 +128,7 @@ export type StaticAdminMetaQuery = {
         }>
         graphql: {
           names: GraphQLNames
-        },
+        }
 
         pageSize: number
         initialColumns: Array<string>

diff --git a/packages/core/src/fields/non-null-graphql.ts b/packages/core/src/fields/non-null-graphql.ts
@@ -20,19 +20,19 @@ export function resolveDbNullable (
 export function makeValidateHook <ListTypeInfo extends BaseListTypeInfo> (
   meta: FieldData,
   config: {
-    label?: string,
+    label?: string
     db?: {
       isNullable?: boolean
-    },
+    }
     graphql?: {
       isNonNull?: {
         read?: boolean
       }
-    },
+    }
     validation?: {
       isRequired?: boolean
       [key: string]: unknown
-    },
+    }
   },
   f?: ValidateFieldHook<ListTypeInfo, 'create' | 'update' | 'delete', ListTypeInfo['fields']>
 ) {

diff --git a/packages/core/src/fields/resolve-hooks.ts b/packages/core/src/fields/resolve-hooks.ts
@@ -26,7 +26,7 @@ function resolveValidateHooks <ListTypeInfo extends BaseListTypeInfo> ({
   validate,
   validateInput,
   validateDelete
-}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>["validate"], Function> | undefined {
+}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>['validate'], (...args: any) => any> | undefined {
   if (!validate && !validateInput && !validateDelete) return
   return {
     create: merge(validateInput,  typeof validate === 'function' ? validate : validate?.create),

diff --git a/packages/core/src/fields/types/calendarDay/index.ts b/packages/core/src/fields/types/calendarDay/index.ts
@@ -25,7 +25,7 @@ export type CalendarDayFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function calendarDay <ListTypeInfo extends BaseListTypeInfo>(config: CalendarDayFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function calendarDay <ListTypeInfo extends BaseListTypeInfo> (config: CalendarDayFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     isIndexed,
     validation,

diff --git a/packages/core/src/fields/types/float/index.ts b/packages/core/src/fields/types/float/index.ts
@@ -27,7 +27,7 @@ export type FloatFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function float <ListTypeInfo extends BaseListTypeInfo>(config: FloatFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function float <ListTypeInfo extends BaseListTypeInfo> (config: FloatFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     defaultValue,
     isIndexed,

diff --git a/packages/core/src/fields/types/password/index.ts b/packages/core/src/fields/types/password/index.ts
@@ -53,7 +53,7 @@ const PasswordFilter = graphql.inputObject({
 
 const bcryptHashRegex = /^\$2[aby]?\$\d{1,2}\$[.\/A-Za-z0-9]{53}$/
 
-export function password <ListTypeInfo extends BaseListTypeInfo>(config: PasswordFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
+export function password <ListTypeInfo extends BaseListTypeInfo> (config: PasswordFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> {
   const {
     bcrypt = bcryptjs,
     workFactor = 10,

diff --git a/packages/core/src/fields/types/select/index.ts b/packages/core/src/fields/types/select/index.ts
@@ -55,7 +55,7 @@ export type SelectFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
 const MAX_INT = 2147483647
 const MIN_INT = -2147483648
 
-export function select <ListTypeInfo extends BaseListTypeInfo>(config: SelectFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
+export function select <ListTypeInfo extends BaseListTypeInfo> (config: SelectFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
   const {
     isIndexed,
     ui: { displayMode = 'select', ...ui } = {},

diff --git a/packages/core/src/fields/types/virtual/index.ts b/packages/core/src/fields/types/virtual/index.ts
@@ -42,7 +42,7 @@ export type VirtualFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
     }
   }
 
-export function virtual <ListTypeInfo extends BaseListTypeInfo>({
+export function virtual <ListTypeInfo extends BaseListTypeInfo> ({
   field,
   ...config
 }: VirtualFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {

diff --git a/packages/core/src/lib/context/createContext.ts b/packages/core/src/lib/context/createContext.ts
@@ -68,7 +68,7 @@ export function createContext ({
   }: {
     prisma: any
     session?: unknown
-    sudo: Boolean
+    sudo: boolean
     req?: IncomingMessage
     res?: ServerResponse
   }) => {

diff --git a/packages/core/src/lib/core/initialise-lists.ts b/packages/core/src/lib/core/initialise-lists.ts
@@ -121,7 +121,7 @@ export type InitialisedList = {
   }
 
   prisma: {
-    types: GraphQLNames, // TODO: not completely appropriate, but what is used for now
+    types: GraphQLNames // TODO: not completely appropriate, but what is used for now
     listKey: string
     mapping: string | undefined
     extendPrismaSchema: ((schema: string) => string) | undefined
@@ -541,7 +541,7 @@ function getListsWithInitialisedFields (
     const findManyArgs: FindManyArgs = {
       where: graphql.arg({
         type: graphql.nonNull(where),
-        defaultValue: listConfig.isSingleton ? ({ id: { equals: '1' } } as {}) : {},
+        defaultValue: listConfig.isSingleton ? ({ id: { equals: '1' } } as object) : {},
       }),
       orderBy: graphql.arg({
         type: graphql.nonNull(graphql.list(graphql.nonNull(orderBy))),

diff --git a/packages/core/src/lib/core/queries/index.ts b/packages/core/src/lib/core/queries/index.ts
@@ -31,7 +31,7 @@ export function getQueriesForList (list: InitialisedList) {
     args: {
       where: graphql.arg({
         type: graphql.nonNull(list.graphql.types.where),
-        defaultValue: list.isSingleton ? ({ id: { equals: '1' } } as {}) : {},
+        defaultValue: list.isSingleton ? ({ id: { equals: '1' } } as object) : {},
       }),
     },
     async resolve (_rootVal, args, context, info) {

diff --git a/packages/core/src/types/admin-meta.ts b/packages/core/src/types/admin-meta.ts
@@ -26,7 +26,7 @@ export type CreateViewFieldModes =
 
 export type AdminConfig = {
   components?: {
-    Logo?: (props: {}) => ReactElement
+    Logo?: (props: object) => ReactElement
     Navigation?: (props: NavigationProps) => ReactElement
   }
 }

diff --git a/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts b/packages/core/src/types/json-field-type-polyfill-for-sqlite.ts
@@ -10,9 +10,10 @@ import {
   type UpdateFieldInputArg,
   fieldType,
 } from '.'
+import { type InputType, type Arg } from '@graphql-ts/schema'
 
 function mapOutputFieldToSQLite (
-  field: graphql.Field<{ value: JSONValue, item: BaseItem }, {}, any, 'value'>
+  field: graphql.Field<{ value: JSONValue, item: BaseItem }, Record<string, Arg<InputType>>, any, 'value'>
 ) {
   const innerResolver = field.resolve || (({ value }) => value)
   return graphql.fields<{

diff --git a/packages/core/src/types/next-fields.ts b/packages/core/src/types/next-fields.ts
@@ -182,7 +182,7 @@ type DBFieldToInputValue<TDBField extends DBField> = TDBField extends ScalarDBFi
       many: readonly ScalarPrismaTypes[Scalar][] | undefined
     }[Mode]
   : TDBField extends RelationDBField<'many' | 'one'>
-  ? { connect?: {}, disconnect?: boolean } | undefined
+  ? { connect?: object, disconnect?: boolean } | undefined
   : TDBField extends EnumDBField<infer Value, infer Mode>
   ? {
       optional: Value | null | undefined

diff --git a/packages/core/src/types/schema/graphql-ts-schema.ts b/packages/core/src/types/schema/graphql-ts-schema.ts
@@ -40,6 +40,7 @@ export { bindGraphQLSchemaAPIToContext } from '@graphql-ts/schema'
 export type { BaseSchemaMeta, Extension } from '@graphql-ts/extend'
 export { extend, wrap } from '@graphql-ts/extend'
 import { field as fieldd } from './schema-api-with-context'
+import { type InputType, type Arg } from '@graphql-ts/schema'
 export { fields, interface, interfaceField, object, union } from './schema-api-with-context'
 
 // TODO: remove when we use { graphql } from '.keystone'
@@ -72,23 +73,23 @@ type FieldFuncResolve<
       ? {
           resolve?: graphqlTsSchema.FieldResolver<
             Source,
-            SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+            SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
             Type,
             Context
           >
         }
       : {
           resolve: graphqlTsSchema.FieldResolver<
             Source,
-            SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+            SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
             Type,
             Context
           >
         }
     : {
         resolve: graphqlTsSchema.FieldResolver<
           Source,
-          SomeTypeThatIsntARecordOfArgs extends Args ? {} : Args,
+          SomeTypeThatIsntARecordOfArgs extends Args ? Record<string, Arg<InputType>> : Args,
           Type,
           Context
         >
@@ -113,7 +114,7 @@ type FieldFunc = <
   Type extends OutputType,
   Key extends string,
   Context extends KeystoneContext<any>,
-  Args extends { [Key in keyof Args]: graphqlTsSchema.Arg<graphqlTsSchema.InputType> } = {}
+  Args extends { [Key in keyof Args]: graphqlTsSchema.Arg<graphqlTsSchema.InputType> } = object
 >(
   field: FieldFuncArgs<Source, Args, Type, Key, Context>
 ) => graphqlTsSchema.Field<Source, Args, Type, Key, Context>
@@ -282,7 +283,7 @@ export const CalendarDay = graphqlTsSchema.graphql.scalar<string>(
   })
 )
 
-export const Empty = graphqlTsSchema.graphql.scalar<{}>(
+export const Empty = graphqlTsSchema.graphql.scalar(
   new GraphQLScalarType({
     name: 'Empty',
     serialize (value) { return null },

diff --git a/packages/document-renderer/src/index.tsx b/packages/document-renderer/src/index.tsx
@@ -42,7 +42,7 @@ interface Renderers {
     blockquote: OnlyChildrenComponent
     code: Component<{ children: string }> | keyof JSX.IntrinsicElements
     layout: Component<{ layout: [number, ...number[]], children: ReactElement[] }>
-    divider: Component<{}> | keyof JSX.IntrinsicElements
+    divider: Component<unknown> | keyof JSX.IntrinsicElements
     heading: Component<{
       level: 1 | 2 | 3 | 4 | 5 | 6
       children: ReactNode

diff --git a/packages/fields-document/src/DocumentEditor/code-block.tsx b/packages/fields-document/src/DocumentEditor/code-block.tsx
@@ -10,7 +10,7 @@ import { useToolbarState } from './toolbar-state'
 
 export * from './code-block-shared'
 
-function CodeButton ({ attrs }: { attrs: {} }) {
+function CodeButton ({ attrs }: { attrs: object }) {
   const {
     editor,
     code: { isDisabled, isSelected },

diff --git a/packages/fields-document/src/DocumentEditor/link.tsx b/packages/fields-document/src/DocumentEditor/link.tsx
@@ -162,7 +162,7 @@ const UnlinkButton = memo(function UnlinkButton ({ onUnlink }: { onUnlink: () =>
 
 let linkIcon = <LinkIcon size="small" />
 
-const LinkButton = forwardRef<HTMLButtonElement, {}>(function LinkButton (props, ref) {
+const LinkButton = forwardRef<HTMLButtonElement>(function LinkButton (props, ref) {
   const {
     editor,
     links: { isDisabled, isSelected },

diff --git a/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts b/packages/fields-document/src/DocumentEditor/tests/jsx/namespace.d.ts
@@ -51,18 +51,18 @@ declare namespace __jsx {
         data: {
           id: string
           label: string
-          data: {}
+          data: object
         }
 
         children: Children
       }
     }
     type Element = Node
     interface ElementAttributesProperty {
-      props: {}
+      props: object
     }
     interface ElementChildrenAttribute {
-      children: {}
+      children: object
     }
   }
 }
diff --git a/packages/fields-document/src/structure-graphql-output.ts b/packages/fields-document/src/structure-graphql-output.ts
@@ -71,7 +71,7 @@ function getOutputGraphQLFieldInner (
         fields: () =>
           Object.fromEntries(
             Object.entries(schema.fields).map(
-              ([key, val]): [string, graphql.Field<unknown, {}, graphql.OutputType, string>] => {
+              ([key, val]): [string, graphql.Field<unknown, Record<string, graphql.Arg<graphql.InputType>>, graphql.OutputType, string>] => {
                 const field = getOutputGraphQLField(
                   `${name}${key[0].toUpperCase()}${key.slice(1)}`,
                   val,