Improve tsconfig and eslint

.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+dist

.eslintrc.json

@@ -1,36 +1,54 @@
 {
-    "parser": "@typescript-eslint/parser",
-    "env": {
-        "browser": true,
-        "node": true
-    },
-    "plugins": [
-        "prettier",
-        "@typescript-eslint",
-        "jest",
-        "import"
+  "parser": "@typescript-eslint/parser",
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "plugins": ["@typescript-eslint", "react", "react-hooks", "jest"],
+  "extends": [
+    "plugin:@typescript-eslint/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "plugin:jest/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2018
+  },
+  "rules": {
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "error",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "ignoreRestSiblings": true,
+        "varsIgnorePattern": "^[iI]gnored",
+        "argsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^ignore"
+      }
     ],
-    "extends": [
-        "prettier",
-        "plugin:prettier/recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:import/typescript",
-        "plugin:jest/recommended"
+    "@typescript-eslint/member-delimiter-style": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@next/next/no-img-element": "off",
+    "import/order": [
+      "error",
+      {
+        "groups": [
+          "builtin",
+          "external",
+          "unknown",
+          "parent",
+          "sibling",
+          "index"
+        ]
+      }
     ],
-    "parserOptions": {
-        "sourceType": "module",
-        "ecmaVersion": 2018
-    },
-    "rules": {
-        "import/namespace": "off",
-        "import/order": [
-            "error"
-        ],
-        "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": "error",
-        "@typescript-eslint/member-delimiter-style": "off",
-        "@typescript-eslint/no-var-requires": "off",
-        "@typescript-eslint/no-extra-semi": "off",
-        "@typescript-eslint/no-explicit-any": "off"
-    }
+    "no-console": [
+      "error",
+      {
+        "allow": ["warn", "error", "assert"]
+      }
+    ]
+  }
 }

package.json

@@ -8,9 +8,10 @@
     "node": "^16"
   },
   "scripts": {
-    "build": "npm run build:node && npm run build:esm",
-    "build:node": "tsc",
-    "build:esm": "tsc --project tsconfig.esnext.json",
+    "build": "rimraf dist && npm run build:types && npm run build:esm && npm run build:cjs",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:types": "tsc -p tsconfig.types.json",
     "lint": "eslint --ext js,ts,tsx src",
     "lint:fix": "npm run lint -- --fix",
     "typecheck": "tsc --noEmit",
@@ -57,6 +58,8 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.5.3",
     "eslint-plugin-prettier": "^4.1.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.1",
     "jest-environment-jsdom": "^28.1.1",
     "next": "^13.1.3",
@@ -65,8 +68,9 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "^6.7.0",
+    "rimraf": "^5.0.1",
     "ts-jest": "^28.0.5",
-    "typescript": "^4.7.4"
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "next": "^12.0.0 || ^13.0.0",

src/inMemoryPagination.tsx

@@ -10,36 +10,39 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
       size: pageSize,
       queryParameters: config?.defaultQueryParameters || {},
     }),
-    []
+    [firstPage, pageSize, config?.defaultQueryParameters]
   )
 
   const [state, setState] = useState(initialState)
 
-  const updateQuery = useCallback((queryParameters: QueryParameters) => {
-    setState((currentState) => {
-      const updatedQueryParameters = {
-        ...currentState.queryParameters,
-        ...queryParameters,
-      }
+  const updateQuery = useCallback(
+    (queryParameters: QueryParameters) => {
+      setState((currentState) => {
+        const updatedQueryParameters = {
+          ...currentState.queryParameters,
+          ...queryParameters,
+        }
 
-      for (const parameter in queryParameters) {
-        if (
-          !!config?.defaultQueryParameters &&
-          (config.defaultQueryParameters[parameter] === undefined ||
-            config.defaultQueryParameters[parameter] ===
-              queryParameters[parameter])
-        ) {
-          delete updatedQueryParameters[parameter]
+        for (const parameter in queryParameters) {
+          if (
+            !!config?.defaultQueryParameters &&
+            (config.defaultQueryParameters[parameter] === undefined ||
+              config.defaultQueryParameters[parameter] ===
+                queryParameters[parameter])
+          ) {
+            delete updatedQueryParameters[parameter]
+          }
         }
-      }
 
-      return {
-        ...currentState,
-        page: 0,
-        queryParameters: updatedQueryParameters,
-      }
-    })
-  }, [])
+        return {
+          ...currentState,
+          page: 0,
+          queryParameters: updatedQueryParameters,
+        }
+      })
+    },
+    [config?.defaultQueryParameters]
+  )
 
   const clear = useCallback(() => {
     setState(() => {

src/nextRouterPagination.tsx

@@ -1,7 +1,6 @@
 import { ParsedUrlQuery } from 'querystring'
 import { useRouter } from 'next/router'
 import { useCallback } from 'react'
-
 import { IndexType, IUseQueryAndPagination, QueryParameters } from './types'
 import { convert } from './utils'
 
@@ -64,7 +63,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
         ) {
           delete params[parameter]
         } else {
-          params[parameter] = queryParameters[parameter].toString()
+          params[parameter] = queryParameters[parameter]?.toString()
         }
       }
 
@@ -75,7 +74,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
         query: params,
       })
     },
-    [router]
+    [router, config?.defaultQueryParameters]
   )
 
   const clear = useCallback(() => {
@@ -93,7 +92,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
     router.push({
       query: params,
     })
-  }, [router])
+  }, [router, config?.defaultQueryParameters])
 
   return {
     queryParameters: extractCurrentQueryParameters(

src/reactRouterPagination.tsx

@@ -42,7 +42,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
         ) {
           params.delete(parameter)
         } else {
-          params.set(parameter, queryParameters[parameter].toString())
+          params.set(parameter, queryParameters[parameter] as string)
         }
       }
 
@@ -54,7 +54,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
         search: params.toString(),
       })
     },
-    [navigate, params]
+    [navigate, params, config?.defaultQueryParameters, routerUrl]
   )
 
   const clear = useCallback(() => {
@@ -69,7 +69,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
       pathname: routerUrl,
       search: params.toString(),
     })
-  }, [navigate, params])
+  }, [navigate, params, config?.defaultQueryParameters, routerUrl])
 
   const setPage = useCallback(
     (page: number) => {
@@ -79,7 +79,7 @@ export const useQueryAndPagination: IUseQueryAndPagination = function (config) {
         search: params.toString(),
       })
     },
-    [navigate, params]
+    [navigate, params, routerUrl]
   )
 
   return {

tsconfig.cjs.json

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "./dist/cjs",
+    "declaration": false,
+    "declarationMap": false,
+    "sourceMap": false,
+    "removeComments": true
+  },
+  "exclude": ["node_modules", "**/__test__/*", "**/__tests__/*"],
+  "include": ["src"]
+}

tsconfig.esm.json

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "es2020",
+    "outDir": "./dist/esm",
+    "declaration": false,
+    "declarationMap": false,
+    "sourceMap": false,
+    "removeComments": true
+  },
+  "exclude": ["node_modules", "**/__test__/*", "**/__tests__/*"],
+  "include": ["src"]
+}

tsconfig.json

@@ -1,14 +1,31 @@
 {
-    "compilerOptions": {
-      "target": "es5",
-      "jsx": "react",
-      "esModuleInterop": true,
-      "outDir": "./dist",
-      "declaration": true,
-      "strict": true,
-      "sourceMap": true,
-      "skipLibCheck": true
-    },
-    "include": ["src"],
-    "exclude": ["node_modules", "**/__test__/*", "**/__tests__/*"]
+  "compilerOptions": {
+    "target": "es2020",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "strict": true,
+    "noImplicitReturns": true,
+    "noImplicitOverride": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
+    "forceConsistentCasingInFileNames": true,
+    "allowUnreachableCode": false,
+    "downlevelIteration": true,
+    "isolatedModules": true,
+    "jsx": "react-jsx",
+    "importHelpers": true,
+    "outDir": "./dist",
+    "declaration": true,
+    "sourceMap": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "node_modules",
+    "**/__test__/*",
+    "**/__tests__/*"
+  ]
 }

tsconfig.types.json

@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "emitDeclarationOnly": true,
+    "outDir": "./dist/types",
+    "declaration": true,
+    "declarationMap": true,
+    "removeComments": false
+  },
+  "exclude": [
+    "src/vitest.ts",
+    "**/__test__/*",
+    "**/__tests__/*",
+    "**/*.stories.tsx",
+    "**/*.stories.ts",
+    "src/examples/*",
+    ".storybook/*"
+  ],
+  "include": ["src"]
+}