fix(typings): resolve typing issues

Author: michaelwittwer

src/dynamo/request/base.request.spec.ts

@@ -4,7 +4,7 @@ import { ModelConstructor } from '../../model/model-constructor'
 import { BaseRequest } from './base.request'
 
 describe('base request', () => {
-  class TestRequest<T> extends BaseRequest<T, any, BaseRequest<T, any, any>> {
+  class TestRequest<T> extends BaseRequest<T, T, any, BaseRequest<T, T, any, any>> {
     constructor(modelClazz: ModelConstructor<T>) {
       super(<any>null, modelClazz)
     }

src/dynamo/request/delete/delete.request.ts

@@ -11,7 +11,7 @@ import { WriteRequest } from '../write.request'
 /**
  * Request class for the DeleteItem operation.
  */
-export class DeleteRequest<T, T2 = T> extends WriteRequest<
+export class DeleteRequest<T, T2 = void> extends WriteRequest<
   T,
   T2,
   DynamoDB.DeleteItemInput,

src/dynamo/request/query/query.request.ts

@@ -19,7 +19,7 @@ export class QueryRequest<T, T2 = T> extends ReadManyRequest<
   DynamoDB.QueryInput,
   DynamoDB.QueryOutput,
   QueryResponse<T2>,
-  QueryRequest<T2>
+  QueryRequest<T, T2>
 > {
   protected readonly logger: Logger
 

src/dynamo/request/read-many.request.spec.ts

@@ -14,7 +14,7 @@ import { or } from '../expression/logical-operator/public.api'
 import { getTableName } from '../get-table-name.function'
 import { ReadManyRequest } from './read-many.request'
 
-class TestRequest<T> extends ReadManyRequest<T, any, any, any, any> {
+class TestRequest<T> extends ReadManyRequest<T, T, any, any, any, any> {
   constructor(modelClazz: ModelConstructor<T>) {
     super(<any>null, modelClazz)
     this.logger = createLogger('TestRequest', modelClazz)

src/dynamo/request/read-many.request.ts

@@ -34,7 +34,7 @@ export abstract class ReadManyRequest<
   I extends DynamoDB.QueryInput | DynamoDB.ScanInput,
   O extends DynamoDB.QueryOutput | DynamoDB.ScanOutput,
   Z extends QueryResponse<T2> | ScanResponse<T2>,
-  R extends QueryRequest<T2> | ScanRequest<T2>
+  R extends QueryRequest<T, T2> | ScanRequest<T, T2>
 > extends StandardRequest<T, T2, I, ReadManyRequest<T, T2, I, O, Z, R>> {
   /** Infinite limit will remove the Limit param from request params when calling ReadManyRequest.limit(ReadManyRequest.INFINITE_LIMIT) */
   static INFINITE_LIMIT = -1
@@ -112,7 +112,6 @@ export abstract class ReadManyRequest<
    * Specifies the list of model attributes to be returned from the table instead of returning the entire document
    * @param attributesToGet List of model attributes to be returned
    */
-  // @ts-ignore: type R does not satisfy the constraint, don't know how to resolve
   projectionExpression(...attributesToGet: Array<keyof T | string>): ReadManyRequest<T, Partial<T>, I, O, Z, R> {
     addProjectionExpressionParam(attributesToGet, this.params, this.metadata)
     return <any>this
@@ -213,7 +212,7 @@ export abstract class ReadManyRequest<
    * fetches all pages. may uses all provisionedOutput, therefore for client side use cases rather use pagedDatasource (exec)
    */
   execFetchAll(): Promise<T2[]> {
-    return fetchAll(<R>(<any>this))
+    return fetchAll(<any>this)
   }
 
   protected mapFromDb = (output: O) => {

src/dynamo/request/scan/scan.request.ts

@@ -17,7 +17,7 @@ export class ScanRequest<T, T2 = T> extends ReadManyRequest<
   DynamoDB.ScanInput,
   DynamoDB.ScanOutput,
   ScanResponse<T2>,
-  ScanRequest<T2>
+  ScanRequest<T, T2>
 > {
   protected readonly logger: Logger
 

src/dynamo/request/standard.request.spec.ts

@@ -4,7 +4,7 @@ import { getTableName } from '../get-table-name.function'
 import { StandardRequest } from './standard.request'
 
 describe('StandardRequest', () => {
-  class MyStandardRequest<T> extends StandardRequest<T, any, MyStandardRequest<T>> {
+  class MyStandardRequest<T> extends StandardRequest<T, T, any, MyStandardRequest<T>> {
     constructor(c: ModelConstructor<T>) {
       super(<any>null, c)
     }

src/dynamo/request/update/update.request.ts

@@ -15,7 +15,7 @@ import { WriteRequest } from '../write.request'
 /**
  * Request class for the UpdateItem operation.
  */
-export class UpdateRequest<T, T2 = T> extends WriteRequest<
+export class UpdateRequest<T, T2 = void> extends WriteRequest<
   T,
   T2,
   DynamoDB.UpdateItemInput,

src/dynamo/request/write.request.spec.ts

@@ -7,7 +7,7 @@ import { or } from '../expression/logical-operator/public.api'
 import { WriteRequest } from './write.request'
 
 describe('write request', () => {
-  class TestWriteRequest<T> extends WriteRequest<T, any, any, TestWriteRequest<T>> {
+  class TestWriteRequest<T> extends WriteRequest<T, T, any, any, TestWriteRequest<T>> {
     protected readonly logger: Logger
     readonly params: any = {}