Merge pull request #94 from masterT/master

Configurable HttpClient

Author: DavidDuwaer

README.md

@@ -130,14 +130,9 @@ import {Model} from 'coloquent';
 
 class Artist extends Model
 {
-    public getJsonApiBaseUrl(): string
-    {
-        return 'http://www.app.com/api/';
-    }
-    
-    protected jsonApiType = 'artists';
-    
-    protected pageSize = 30;
+    static jsonApiBaseUrl = 'http://www.app.com/api'
+    static jsonApiType = 'artists'
+    static pageSize = 30
 }
 ```
 
@@ -151,15 +146,12 @@ import {Model, ToManyRelation, ToOneRelation} from 'coloquent';
 
 abstract class AppModel extends Model
 {
-    getJsonApiBaseUrl(): string
-    {
-        return 'http://www.app.com/api/';
-    }
+    static jsonApiBaseUrl = 'http://www.app.com/api'
 }
 
 class Artist extends AppModel
 {
-    jsonApiType = 'artists';
+    static jsonApiType = 'artists'
 
     readOnlyAttributes = [
         'age'
@@ -198,7 +190,7 @@ class Artist extends AppModel
 
 class Album extends AppModel
 {
-    jsonApiType = 'albums';
+    static jsonApiType = 'albums'
 
     artist(): ToOneRelation<Artist, this>
     {
@@ -223,7 +215,7 @@ class Album extends AppModel
 
 class Song extends AppModel
 {
-    jsonApiType = 'songs';
+    static jsonApiType = 'songs'
 
     album(): ToOneRelation<Album, this>
     {

package-lock.json

@@ -52,6 +52,6 @@
     "moxios": "^0.4.0",
     "rimraf": "^3.0.0",
     "ts-node": "^8.4.1",
-    "typescript": "^3.6.4"
+    "typescript": "^4.5.4"
   }
 }

package.json

@@ -17,6 +17,8 @@ import {RetrievalResponse} from "./response/RetrievalResponse";
 
 export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResponse<M> = PluralResponse<M>> implements QueryMethods<M, GET_RESPONSE>
 {
+    protected readonly baseUrl: string;
+
     protected readonly modelType: any;
 
     private readonly httpClient: HttpClient;
@@ -37,13 +39,13 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
         forceSingular: boolean = false
     ) {
         this.modelType = modelType;
-        let modelInstance: M = (new (<any> modelType)());
+        this.baseUrl = modelType.effectiveJsonApiBaseUrl;
         baseModelJsonApiType = baseModelJsonApiType
             ? baseModelJsonApiType
-            : modelInstance.getJsonApiType();
+            : modelType.effectiveJsonApiType;
         this.query = new Query(baseModelJsonApiType, queriedRelationName, baseModelJsonApiId);
         this.initPaginationSpec();
-        this.httpClient = modelType.getHttpClient();
+        this.httpClient = modelType.effectiveHttpClient;
         this.forceSingular = forceSingular;
     }
 
@@ -53,7 +55,7 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
         clone.getQuery().getPaginationSpec().setPage(page);
         if (this.forceSingular) {
             return this.getHttpClient()
-                .get(clone.getQuery().toString())
+                .get(this.baseUrl + '/' + clone.getQuery().toString())
                 .then(
                     (response: HttpClientResponse) => {
                         return new SingularResponse(clone.getQuery(), response, this.modelType, response.getData()) as unknown as GET_RESPONSE;
@@ -64,7 +66,7 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
                 );
         } else {
             return this.getHttpClient()
-                .get(clone.getQuery().toString())
+                .get(this.baseUrl + '/' + clone.getQuery().toString())
                 .then(
                     (response: HttpClientResponse) => {
                         return new PluralResponse(clone.getQuery(), response, this.modelType, response.getData(), page) as unknown as GET_RESPONSE;
@@ -81,7 +83,7 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
         const clone = this.clone();
         clone.getQuery().getPaginationSpec().setPageLimit(1);
         return <Promise<SingularResponse<M>>> this.getHttpClient()
-            .get(this.query.toString())
+            .get(this.baseUrl + '/' + clone.getQuery().toString())
             .then(
                 (response: HttpClientResponse) => {
                     return new SingularResponse(this.query, response, this.modelType, response.getData());
@@ -103,7 +105,7 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
         const clone = this.clone();
         clone.query.setIdToFind(id);
         return <Promise<SingularResponse<M>>> clone.getHttpClient()
-            .get(clone.getQuery().toString())
+            .get(this.baseUrl + '/' + clone.getQuery().toString())
             .then(
                 (response: HttpClientResponse) => {
                     return new SingularResponse(clone.getQuery(), response, this.modelType, response.getData());
@@ -163,7 +165,7 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
                 direction === SortDirection.ASC
             )
         );
-        
+
         return clone;
     }
 
@@ -218,15 +220,15 @@ export class Builder<M extends Model = Model, GET_RESPONSE extends RetrievalResp
                 new OffsetBasedPaginationSpec(
                     this.modelType.getPaginationOffsetParamName(),
                     this.modelType.getPaginationLimitParamName(),
-                    this.modelType.getPageSize()
+                    this.modelType.pageSize
                 )
             );
         } else if (paginationStrategy === PaginationStrategy.PageBased) {
             this.query.setPaginationSpec(
                 new PageBasedPaginationSpec(
                     this.modelType.getPaginationPageNumberParamName(),
                     this.modelType.getPaginationPageSizeParamName(),
-                    this.modelType.getPageSize()
+                    this.modelType.pageSize
                 )
             );
         } else {