fix(types): fixed generics again

Author: Terreii

src/global.d.ts

@@ -7,7 +7,7 @@ declare module 'pouchdb-utils' {
 }
 
 declare module 'pouchdb-selector-core' {
-  export function matchesSelector<T extends {}>(
+  export function matchesSelector<T extends Record<string, unknown>>(
     doc: PouchDB.Core.Document<T>,
     selector: PouchDB.Find.Selector
   ): boolean

src/subscription.ts

@@ -1,6 +1,6 @@
 import { clone } from 'pouchdb-utils'
 
-export type DocsCallback<T extends {}> = (
+export type DocsCallback<T extends Record<string, unknown>> = (
   deleted: boolean,
   id: PouchDB.Core.DocumentId,
   doc?: PouchDB.Core.Document<T>
@@ -22,7 +22,7 @@ interface SubscriptionToAView {
   feed: PouchDB.Core.Changes<Record<string, unknown>>
   callbacks: Set<ViewCallback>
 }
-export type subscribeToDocs = <T extends {}>(
+export type subscribeToDocs = <T extends Record<string, unknown>>(
   ids: PouchDB.Core.DocumentId[] | null,
   callback: DocsCallback<T>
 ) => () => void
@@ -44,7 +44,7 @@ export default class SubscriptionManager {
     pouch.once('destroyed', this.#destroyListener)
   }
 
-  subscribeToDocs<T extends {}>(
+  subscribeToDocs<T extends Record<string, unknown>>(
     ids: PouchDB.Core.DocumentId[] | null,
     callback: DocsCallback<T>
   ): () => void {

src/useAllDocs.ts

@@ -8,7 +8,7 @@ import { useDeepMemo, CommonOptions } from './utils'
  * Get all docs or a slice of all docs and subscribe to their updates.
  * @param options PouchDB's allDocs options.
  */
-export default function useAllDocs<Content extends {}>(
+export default function useAllDocs<Content extends Record<string, unknown>>(
   options?: CommonOptions &
     (
       | PouchDB.Core.AllDocsWithKeyOptions

src/useDoc.ts

@@ -4,7 +4,7 @@ import { useContext } from './context'
 import useStateMachine, { ResultType } from './state-machine'
 import type { CommonOptions } from './utils'
 
-type DocResultType<T extends {}> = ResultType<{
+type DocResultType<T extends Record<string, unknown>> = ResultType<{
   doc: (PouchDB.Core.Document<T> & PouchDB.Core.GetMeta) | null
 }>
 
@@ -14,7 +14,7 @@ type DocResultType<T extends {}> = ResultType<{
  * @param {object} [options] - PouchDB get options. Excluding 'open_revs'.
  * @param {object|function} [initialValue] - Value that should be returned while fetching the doc.
  */
-export default function useDoc<Content extends {}>(
+export default function useDoc<Content extends Record<string, unknown>>(
   id: PouchDB.Core.DocumentId,
   options?: (PouchDB.Core.GetOptions & CommonOptions) | null,
   initialValue?: (() => Content) | Content
@@ -126,7 +126,7 @@ export default function useDoc<Content extends {}>(
               dispatch({
                 type: 'loading_finished',
                 payload: {
-                  doc: doc as PouchDB.Core.Document<Content> &
+                  doc: doc as unknown as PouchDB.Core.Document<Content> &
                     PouchDB.Core.GetMeta,
                 },
               })

src/useFind.ts

@@ -61,7 +61,7 @@ export interface FindHookOptions extends CommonOptions {
  * Query, and optionally create, a Mango index and subscribe to its updates.
  * @param {object} [opts] A combination of PouchDB's find options and create index options.
  */
-export default function useFind<Content extends {}>(
+export default function useFind<Content extends Record<string, unknown>>(
   options: FindHookOptions
 ): ResultType<PouchDB.Find.FindResponse<Content>> {
   const { pouchdb: pouch, subscriptionManager } = useContext(options.db)

src/usePouch.ts

@@ -4,7 +4,7 @@ import { useContext } from './context'
  * Get access to the PouchDB database that is provided by the provider.
  * @param {string | undefined} dbName Select the database to be returned by its name/key.
  */
-export default function usePouch<T extends {}>(
+export default function usePouch<T extends Record<string, unknown>>(
   dbName?: string
 ): PouchDB.Database<T> {
   return useContext(dbName).pouchdb as PouchDB.Database<T>

src/useView.ts

@@ -6,25 +6,28 @@ import type SubscriptionManager from './subscription'
 import useStateMachine, { ResultType, Dispatch } from './state-machine'
 import { useDeepMemo, CommonOptions } from './utils'
 
-type ViewResponseBase<Result extends {}> = PouchDB.Query.Response<Result> & {
-  /**
-   * Include an update_seq value indicating which sequence id of the underlying database the view
-   * reflects.
-   */
-  update_seq?: number | string
-}
+type ViewResponseBase<Result extends Record<string, unknown>> =
+  PouchDB.Query.Response<Result> & {
+    /**
+     * Include an update_seq value indicating which sequence id of the underlying database the view
+     * reflects.
+     */
+    update_seq?: number | string
+  }
 
-export type ViewResponse<T extends {}> = ResultType<ViewResponseBase<T>>
+export type ViewResponse<T extends Record<string, unknown>> = ResultType<
+  ViewResponseBase<T>
+>
 
 /**
  * Query a view and subscribe to its updates.
  * @param {string | function | object} fun The name of the view or a temporary view.
  * @param {object} [opts] PouchDB's query-options
  */
 export default function useView<
-  Content extends {},
-  Result extends {},
-  Model extends {} = Content
+  Content extends Record<string, unknown>,
+  Result extends Record<string, unknown>,
+  Model extends Record<string, unknown> = Content
 >(
   fun: string | PouchDB.Map<Model, Result> | PouchDB.Filter<Model, Result>,
   opts?: PouchDB.Query.Options<Model, Result> & {
@@ -139,7 +142,10 @@ export default function useView<
  * @param fn Name of the view.
  * @param option PouchDB's query options.
  */
-function doDDocQuery<Model extends {}, Result extends {}>(
+function doDDocQuery<
+  Model extends Record<string, unknown>,
+  Result extends Record<string, unknown>
+>(
   dispatch: Dispatch<PouchDB.Query.Response<Result>>,
   pouch: PouchDB.Database<Record<string, unknown>>,
   subscriptionManager: SubscriptionManager,
@@ -281,7 +287,10 @@ function doDDocQuery<Model extends {}, Result extends {}>(
  * @param fn The temporary view.
  * @param option PouchDB's query options.
  */
-function doTemporaryQuery<Model extends {}, Result extends {}>(
+function doTemporaryQuery<
+  Model extends Record<string, unknown>,
+  Result extends Record<string, unknown>
+>(
   dispatch: Dispatch<PouchDB.Query.Response<Result>>,
   pouch: PouchDB.Database<Record<string, unknown>>,
   subscriptionManager: SubscriptionManager,