useRepo Type Mismatch

[RodTGG]

Hey guys any help would be appreciated. Sorry if this has been asked already, i couldn't find anyone with the same issue.

Using

• Vue: 3.4.27
• Vite: 5.2.11
• Typescript: 5.4.5

I have the following simple model

class ClientModel extends Model {
  static entity = 'Clients'

  static fields(): ModelFields {
    return {
      id: this.attr(null),
      ...
   }
}

Which has a fairly simple custom repo

class ClientRepo extends Repository<ClientModel> {
  use = ClientModel

  static loadingAll = false

  async fetchAll(): Promise<Array<ClientModel>> {
    ...
  }
}

which is then called somewhere

import { useRepo } from 'pinia-orm'
import ClientRepo from '@/repos/ClientRepo'
import ClientModel from '@/models/ClientModel'

const repo = useRepo(ClientRepo)

repo.fetchAll()

Ive just switched from 1.7.2 -> 1.9.0 and have started getting the following from useRepo()

No overload matches this call.
  Overload 1 of 2, '(repository: Repository<Model> | Constructor<Repository<Model>>, pinia?: Pinia | undefined): Repository<Model>', gave the following error.
    Argument of type 'typeof ClientRepo' is not assignable to parameter of type 'Repository<Model> | Constructor<Repository<Model>>'.
      Type 'typeof ClientRepo' is not assignable to type 'Constructor<Repository<Model>>'.
        Construct signature return types 'ClientRepo' and 'Repository<Model>' are incompatible.
          The types of 'query().wheres' are incompatible between these types.
            Type 'Where<ClientModel>[]' is not assignable to type 'Where<Model>[]'.
              Type 'Where<ClientModel>' is not assignable to type 'Where<Model>'.
                Types of property 'field' are incompatible.
                  Type 'string | string[] | WherePrimaryClosure<ClientModel> | undefined' is not assignable to type 'string | string[] | WherePrimaryClosure<Model> | undefined'.
                    Type 'WherePrimaryClosure<ClientModel>' is not assignable to type 'string | string[] | WherePrimaryClosure<Model> | undefined'.
                      Type 'WherePrimaryClosure<ClientModel>' is not assignable to type 'WherePrimaryClosure<Model>'.
                        Type 'Model' is not assignable to type 'ClientModel'.
  Overload 2 of 2, '(model: Constructor<Model>, pinia?: Pinia | undefined): Repository<Model>', gave the following error.
    Argument of type 'typeof ClientRepo' is not assignable to parameter of type 'Constructor<Model>'.
      Type 'ClientRepo' is missing the following properties from type 'Model': _meta, $entity, $config, $namespace, and 39 more.ts-plugin(2769)

seems that after the update custom Repository<Client (extending Model)> to Repository<Model> are no longer equal types?

If i change

class ClientRepo extends Repository<ClientModel> 
{
...
}

to

class ClientRepo extends Repository 
{
...
}

the problem seems to go away, however then i lose type safety for the return types.

[CodeDredd]

Fix merged : #1848

[RodTGG]

Thank you!