diff --git a/package.json b/package.json index 4f0076b0..9bd557c5 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,8 @@ "clean": "rimraf lib", "test": "jest", "test-watch": "jest --watch", - "lint": "eslint src/*", - "lint-fix": "eslint src/* --fix", - "lint:fix": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}' --quiet --fix", + "lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}'", + "lint-fix": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}' --quiet --fix", "lint-staged": "lint-staged", "coverage": "cross-env NODE_ENV=test jest --coverage", "coverage-ci": "npm run coverage && cat ./coverage/lcov.info | codecov", diff --git a/src/graphqlProtocol/connection.ts b/src/graphqlProtocol/connection.ts index 25d74da5..1b815fd1 100644 --- a/src/graphqlProtocol/connection.ts +++ b/src/graphqlProtocol/connection.ts @@ -15,12 +15,9 @@ import { ProtocolGraphQL } from './ProtocolGraphQL'; import { ProtocolGraphQLConfiguration } from './ProtocolGraphQLConfiguration'; import { generateSortInput } from './sort'; import { generateFilterInput } from './filter'; +import { ConnectionNode } from './types'; // import { Entity } from '../engine/entity/Entity'; -export type ConnectioNode = { - cursor: any; -}; - export const generateConnectionArgs = (entity, graphRegistry) => { const sortInput = generateSortInput(entity); const filterInput = generateFilterInput(entity, graphRegistry); @@ -228,7 +225,7 @@ export const connectionFromData = ( pageInfoFromData, ) => { const entityName = entity.name; - let nodeToEdge; + let nodeToEdge: (node: any, idx?: number) => ConnectionNode; if (entity.getPrimaryAttribute()) { const primaryAttributeName = entity.getPrimaryAttribute().name; @@ -247,10 +244,10 @@ export const connectionFromData = ( }); } - const edges = transformedData.map(nodeToEdge); + const edges: ConnectionNode[] = transformedData.map(nodeToEdge); - const firstNode: ConnectioNode = first(edges); - const lastNode: ConnectioNode = last(edges); + const firstNode = first(edges); + const lastNode = last(edges); return { edges, diff --git a/src/graphqlProtocol/types.ts b/src/graphqlProtocol/types.ts index 307b5f21..44f91abc 100644 --- a/src/graphqlProtocol/types.ts +++ b/src/graphqlProtocol/types.ts @@ -23,3 +23,8 @@ export type OutputFields = { // eslint-disable-next-line @typescript-eslint/no-explicit-any result?: any; }; + +export type ConnectionNode = { + cursor?: any; + node?: any; +};