Merge branch 'main' into devtools-hook

.github/workflows/test.yml

@@ -41,6 +41,7 @@ jobs:
       - run: pnpm types:check
       - run: pnpm lint
       - run: pnpm build
+      - run: pnpm test-typing
       - run: pnpm test
         env:
           CI: true

.gitignore

@@ -10,7 +10,8 @@ dist
 .eslintcache
 examples/**/yarn.lock
 package-lock.json
-tsconfig.tsbuildinfo
+*/**/*.tsbuildinfo
 coverage
 */**/.turbo
 .turbo
+.rollup.cache

_internal/types.ts

@@ -204,15 +204,13 @@ export type MutatorWrapper<Fn> = Fn extends (
 export type Mutator<Data = any> = MutatorWrapper<MutatorFn<Data>>
 
 export interface ScopedMutator<Data = any> {
-  /** This is used for bound mutator */
-  (
-    key: Key,
-    data?: Data | Promise<Data> | MutatorCallback<Data>,
+  <T = Data>(
+    matcher: (key?: Arguments) => boolean,
+    data?: T | Promise<T> | MutatorCallback<T>,
     opts?: boolean | MutatorOptions<Data>
-  ): Promise<Data | undefined>
-  /** This is used for global mutator */
-  <T = any>(
-    key: Key,
+  ): Promise<Array<T | undefined>>
+  <T = Data>(
+    key: Arguments,
     data?: T | Promise<T> | MutatorCallback<T>,
     opts?: boolean | MutatorOptions<Data>
   ): Promise<T | undefined>
@@ -223,8 +221,6 @@ export type KeyedMutator<Data> = (
   opts?: boolean | MutatorOptions<Data>
 ) => Promise<Data | undefined>
 
-// Public types
-
 export type SWRConfiguration<
   Data = any,
   Error = any,
@@ -267,6 +263,7 @@ export type RevalidateCallback = <K extends RevalidateEvent>(
 ) => RevalidateCallbackReturnType[K]
 
 export interface Cache<Data = any> {
+  keys(): IterableIterator<string>
   get(key: Key): State<Data> | undefined
   set(key: Key, value: State<Data>): void
   delete(key: Key): void

_internal/utils/cache.ts

@@ -42,6 +42,7 @@ export const initCache = <Data = any>(
     // If there's no global state bound to the provider, create a new one with the
     // new mutate function.
     const EVENT_REVALIDATORS = {}
+
     const mutate = internalMutate.bind(
       UNDEFINED,
       provider
@@ -58,16 +59,14 @@ export const initCache = <Data = any>(
       subscriptions[key] = subs
 
       subs.push(callback)
-      return () => {
-        subs.splice(subs.indexOf(callback), 1)
-      }
+      return () => subs.splice(subs.indexOf(callback), 1)
     }
     const setter = (key: string, value: any, prev: any) => {
       provider.set(key, value)
       const subs = subscriptions[key]
       if (subs) {
         for (let i = subs.length; i--; ) {
-          subs[i](value, prev)
+          subs[i](prev, value)
         }
       }
     }

_internal/utils/helper.ts

@@ -1,5 +1,5 @@
 import { SWRGlobalState } from './global-state'
-import { Key, Cache, State, GlobalState } from '../types'
+import type { Key, Cache, State, GlobalState } from '../types'
 
 const EMPTY_CACHE = {}
 export const noop = () => {}
@@ -13,9 +13,12 @@ export const UNDEFINED = (/*#__NOINLINE__*/ noop()) as undefined
 export const OBJECT = Object
 
 export const isUndefined = (v: any): v is undefined => v === UNDEFINED
-export const isFunction = (v: any): v is Function => typeof v == 'function'
-export const isEmptyCache = (v: any): boolean => v === EMPTY_CACHE
-export const mergeObjects = (a: any, b: any) => OBJECT.assign({}, a, b)
+export const isFunction = <
+  T extends (...args: any[]) => any = (...args: any[]) => any
+>(
+  v: unknown
+): v is T => typeof v == 'function'
+export const mergeObjects = (a: any, b?: any) => OBJECT.assign({}, a, b)
 
 const STR_UNDEFINED = 'undefined'