Fix lint after eslint update

otahontas · Jun 27, 2024 · e6becb1 · e6becb1
1 parent a290728
commit e6becb1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -8,41 +8,46 @@ import { fileURLToPath } from "node:url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-    allConfig: js.configs.all,
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended
+  allConfig: js.configs.all,
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
 });
 
-export default [{
+export default [
+  {
     ignores: ["**/dist/", "**/node_modules/", "**/.git/", "**/pnpm-lock.yaml"],
-}, ...compat.extends(
+  },
+  ...compat.extends(
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "prettier",
     "plugin:unicorn/recommended",
     "plugin:perfectionist/recommended-natural",
-), {
+  ),
+  {
     languageOptions: {
-        parser: tsParser,
+      parser: tsParser,
     },
 
     plugins: {
-        "@typescript-eslint": typescriptEslint,
+      "@typescript-eslint": typescriptEslint,
     },
 
     rules: {
-        "no-console": "error",
+      "no-console": "error",
     },
-}, {
+  },
+  {
     files: ["**/test/**/*.ts", "**/test/**/*.tsx"],
 
     rules: {
-        "@typescript-eslint/no-empty-function": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-non-null-assertion": "off",
-        "no-console": "off",
-        "unicorn/consistent-function-scoping": "off",
-        "unicorn/no-null": "off",
-        "unicorn/no-useless-undefined": "off",
+      "@typescript-eslint/no-empty-function": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
+      "no-console": "off",
+      "unicorn/consistent-function-scoping": "off",
+      "unicorn/no-null": "off",
+      "unicorn/no-useless-undefined": "off",
     },
-}];
+  },
+];
diff --git a/src/api.ts b/src/api.ts
@@ -53,18 +53,18 @@ export const enhanceApi = <
     TagTypes
   >,
 >(
-  options: TRPCClientOptions<TRouter> & {
+  options: {
     api: ExistingApi;
   } & {
     endpointOptions?: {
       [K in keyof NewDefinitions]?: Omit<NewDefinitions[K], DisabledEndpointOptions>;
     };
-  },
+  } & TRPCClientOptions<TRouter>,
 ) =>
   wrapApiToProxy({
     api: options.api as Api<
       BaseQuery,
-      Endpoints & CreateEndpointDefinitions<TRouter, BaseQuery, ReducerPath, TagTypes>,
+      CreateEndpointDefinitions<TRouter, BaseQuery, ReducerPath, TagTypes> & Endpoints,
       ReducerPath,
       TagTypes,
       SupportedModule

diff --git a/src/wrap-api-to-proxy.ts b/src/wrap-api-to-proxy.ts
@@ -90,7 +90,6 @@ const injectEndpointToApi = <Api extends Injectable, TRouter extends AnyRouter>(
     // TODO: https://github.com/otahontas/trpc-rtk-query/issues/41
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     queryFn: (procedureArguments: unknown, api: any, extraOptions: any) =>
-      // eslint-disable-next-line unicorn/consistent-destructuring
       createTRPCBaseQuery(options.tRPCClientOptions)(
         {
           procedureArguments,

diff --git a/test/create-trpc-api.test-d.ts b/test/create-trpc-api.test-d.ts
@@ -84,7 +84,6 @@ describe("create-trpc-api", () => {
       .exclude<typeof skipToken>()
       .toMatchTypeOf<{ deepInput: string }>();
     expectTypeOf(
-      // eslint-disable-next-line unicorn/consistent-destructuring
       api.endpoints.nested_Deep_GetVeryNestedMessage.useQuery,
     ).toBeFunction();
 
@@ -117,7 +116,6 @@ describe("create-trpc-api", () => {
   });
 
   it("allows injecting trpc api to existing api infering types from getclient", () => {
-    // eslint-disable-next-line unicorn/consistent-function-scoping
     const getClient = async () => createTRPCProxyClient<AppRouter>(testClientOptions);
 
     const api = enhanceApi({
@@ -176,7 +174,6 @@ describe("create-trpc-api", () => {
       .exclude<typeof skipToken>()
       .toMatchTypeOf<{ deepInput: string }>();
     expectTypeOf(
-      // eslint-disable-next-line unicorn/consistent-destructuring
       api.endpoints.nested_Deep_GetVeryNestedMessage.useQuery,
     ).toBeFunction();