Fix model typing

Author: tobyzerner

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+-   Fix model typing
+
 ## [0.2.0-beta.6] - 2024-12-05
 
 ### Changed

src/model.ts

@@ -1,7 +1,10 @@
-import { JsonApiResource, ModelForType, SchemaCollection } from './types';
+import { JsonApiResource, SchemaCollection } from './types';
 import { Store } from './store.ts';
 
-class ModelBase<Schema extends JsonApiResource = JsonApiResource> {
+class ModelBase<
+    Schema extends JsonApiResource = JsonApiResource,
+    Schemas extends SchemaCollection = SchemaCollection,
+> {
     public type: Schema['type'];
     public id: Schema['id'];
     public attributes: NonNullable<Schema['attributes']> = {};
@@ -11,7 +14,7 @@ class ModelBase<Schema extends JsonApiResource = JsonApiResource> {
 
     constructor(
         data: Schema,
-        protected store: Store,
+        protected store: Store<Schemas>,
     ) {
         this.type = data.type;
         this.id = data.id;
@@ -103,7 +106,7 @@ class ModelBase<Schema extends JsonApiResource = JsonApiResource> {
 
 type ProxiedModel<
     Schema extends JsonApiResource,
-    Schemas extends Record<string, JsonApiResource>,
+    Schemas extends SchemaCollection,
 > = Schema &
     Schema['attributes'] & {
         [Property in keyof NonNullable<Schema['relationships']>]?: NonNullable<
@@ -131,3 +134,19 @@ export const Model: new <
     data: JsonApiResource<Schema['type']>,
     store: Store<Schemas>,
 ) => Model<Schema, Schemas> = ModelBase as any;
+
+export type ModelMap<Schemas extends SchemaCollection = SchemaCollection> = {
+    [Type in keyof Schemas & string]?: new (
+        data: JsonApiResource<Type>,
+        store: Store<Schemas>,
+    ) => Schemas[Type];
+};
+
+export type ModelForType<
+    Type extends string,
+    Schemas extends SchemaCollection,
+> = Type extends keyof Schemas
+    ? Schemas[Type] extends ModelBase<JsonApiResource<Type>, Schemas>
+        ? Schemas[Type]
+        : Model<JsonApiResource<Type>, Schemas>
+    : Model<JsonApiResource<Type>, Schemas>;

src/store.ts

@@ -1,10 +1,8 @@
-import { Model } from './model';
+import { Model, ModelForType, ModelMap } from './model';
 import {
     JsonApiDocument,
     JsonApiIdentifier,
     JsonApiResource,
-    ModelForType,
-    ModelMap,
     SchemaCollection,
 } from './types';
 

src/types.ts

@@ -1,6 +1,3 @@
-import { Model } from './model.ts';
-import { Store } from './store.ts';
-
 export interface JsonApiDocument<Type extends string = string> {
     data: JsonApiResource<Type> | JsonApiResource<Type>[] | null;
     included?: JsonApiResource[];
@@ -40,17 +37,3 @@ export interface JsonApiRelationshipToMany<Type extends string = string>
 }
 
 export type SchemaCollection = { [Type in string]: JsonApiResource<Type> };
-
-export type ModelMap<Schemas extends SchemaCollection = SchemaCollection> = {
-    [Type in keyof Schemas & string]?: new (
-        data: JsonApiResource<Type>,
-        store: Store<Schemas>,
-    ) => Schemas[Type];
-};
-
-export type ModelForType<
-    Type extends string,
-    Schemas extends SchemaCollection,
-> = Type extends keyof Schemas
-    ? Model<Schemas[Type], Schemas>
-    : Model<JsonApiResource<Type>, Schemas>;