feat: update deps, query core

Author: DamianOsipiuk

package-lock.json

@@ -48,52 +48,46 @@
   "dependencies": {
     "@vue/devtools-api": "^6.1.4",
     "match-sorter": "^6.3.1",
-    "react-query": "^4.0.0-beta.15",
-    "vue-demi": "0.10.1"
+    "react-query": "^4.0.0-beta.20",
+    "vue-demi": "0.13.1"
   },
   "peerDependencies": {
-    "@nuxtjs/composition-api": "^0.28.0",
     "@vue/composition-api": "^1.1.2",
-    "vue": "^2.0.0 || >=3.0.0"
+    "vue": "^2.5.0 || >=3.0.0"
   },
   "peerDependenciesMeta": {
     "@vue/composition-api": {
       "optional": true
-    },
-    "@nuxtjs/composition-api": {
-      "optional": true
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.4",
-    "@commitlint/config-conventional": "^16.2.4",
-    "@nuxtjs/composition-api": "^0.32.0",
+    "@commitlint/cli": "^17.0.2",
+    "@commitlint/config-conventional": "^17.0.2",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "@types/jest": "^27.5.0",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
-    "@vue/compiler-sfc": "^3.2.33",
-    "@vue/composition-api": "^1.6.1",
+    "@types/jest": "^28.1.1",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
+    "@vue/composition-api": "^1.6.2",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
-    "@vue/vue3-jest": "27.0.0",
-    "eslint": "^8.15.0",
+    "@vue/vue3-jest": "28.0.0",
+    "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.7.1",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
     "prettier": "^2.6.2",
-    "rollup": "^2.72.0",
+    "rollup": "^2.75.5",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-typescript2": "^0.31.2",
+    "rollup-plugin-typescript2": "^0.32.0",
     "rollup-plugin-vue": "^6.0.0",
-    "ts-jest": "^28.0.1",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.4",
-    "vue": "^3.2.33",
+    "ts-jest": "^28.0.4",
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.3",
+    "vue": "^3.2.36",
     "vue2": "npm:vue@2"
   }
 }

package.json

@@ -12,7 +12,6 @@ const common = {
     "vue",
     "vue-demi",
     "match-sorter",
-    "@nuxtjs/composition-api",
   ],
   watch: {
     include: "src/**",

rollup.config.ts

@@ -13,10 +13,6 @@ import { reactive, ref } from "vue-demi";
 
 describe("utils", () => {
   describe("isQueryKey", () => {
-    test("should detect string as query key", () => {
-      expect(isQueryKey("string")).toEqual(true);
-    });
-
     test("should detect an array as query key", () => {
       expect(isQueryKey(["string", "array"])).toEqual(true);
     });

src/vuejs/__tests__/utils.test.ts

@@ -103,19 +103,19 @@ export class QueryClient extends QC {
 
   setQueriesData<TData>(
     queryKey: MaybeRefDeep<QueryKey>,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: MaybeRefDeep<SetDataOptions>
-  ): [QueryKey, TData][];
+  ): [QueryKey, TData | undefined][];
   setQueriesData<TData>(
     filters: MaybeRefDeep<QueryFilters>,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: MaybeRefDeep<SetDataOptions>
-  ): [QueryKey, TData][];
+  ): [QueryKey, TData | undefined][];
   setQueriesData<TData>(
     queryKeyOrFilters: MaybeRefDeep<QueryKey | QueryFilters>,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: MaybeRefDeep<SetDataOptions>
-  ): [QueryKey, TData][] {
+  ): [QueryKey, TData | undefined][] {
     const arg1Unreffed = cloneDeepUnref(queryKeyOrFilters);
     const arg3Unreffed = cloneDeepUnref(options) as SetDataOptions;
     if (isQueryKey(arg1Unreffed)) {

src/vuejs/queryClient.ts

@@ -19,10 +19,6 @@ import { UseQueryOptions } from "./useQuery";
 // Avoid TS depth-limit error in case of large array literal
 type MAXIMUM_DEPTH = 20;
 
-type InvalidQueryFn = QueryFunction<
-  undefined | Promise<undefined> | void | Promise<void>
->;
-
 type GetOptions<T> =
   // Part 1: responsible for applying explicit type parameter to function arguments, if object { queryFnData: TQueryFnData, error: TError, data: TData }
   T extends {
@@ -43,9 +39,7 @@ type GetOptions<T> =
     : T extends [infer TQueryFnData]
     ? UseQueryOptions<TQueryFnData>
     : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
-    T extends { queryFn?: InvalidQueryFn }
-    ? never | "queryFn must not return undefined or void"
-    : T extends {
+    T extends {
         queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>;
         select: (data: any) => infer TData;
       }
@@ -100,9 +94,7 @@ export type UseQueriesOptions<
   ? T
   : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
   // use this to infer the param types in the case of Array.map() argument
-  T extends { queryFn: InvalidQueryFn }[]
-  ? (never | "queryFn must not return undefined or void")[]
-  : T extends UseQueryOptions<
+  T extends UseQueryOptions<
       infer TQueryFnData,
       infer TError,
       infer TData,

src/vuejs/useQueries.ts

@@ -19,7 +19,7 @@ export function getClientKey(key?: string) {
 }
 
 export function isQueryKey(value: unknown): value is QueryKey {
-  return typeof value === "string" || Array.isArray(value);
+  return Array.isArray(value);
 }
 
 // This Function is Deprecated. It's not used internally anymore.
@@ -68,7 +68,7 @@ export function parseFilterArgs<TFilters extends QueryFilters>(
   arg2?: TFilters
 ): TFilters {
   if (isQueryKey(arg1)) {
-    return Object.assign(arg2, { queryKey: arg1 });
+    return Object.assign(arg2 || ({} as TFilters), { queryKey: arg1 });
   }
 
   return arg1 || ({} as TFilters);
@@ -103,7 +103,7 @@ export function parseMutationFilterArgs(
   arg2?: MutationFilters
 ): MutationFilters | undefined {
   if (isQueryKey(arg1)) {
-    return Object.assign(arg2, {
+    return Object.assign(arg2 || ({} as MutationFilters), {
       mutationKey: arg1,
     });
   }