my-q-format-response-aws-lambda 1.0.62 → 2.0.2

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMessageResponse = exports.controlResponseNull = exports.normaliseMongoPaginate = exports.normaliseMongoFilter = exports.optionsPaginationParams = exports.messagesREST = exports.CreateResponse = exports.ResponseVO = exports.ResponseBodyVO = exports.StatusCode = exports.StatusResult = void 0;
+exports.parseMessageResponse = exports.controlResponseNull = exports.normaliseMongoPaginate = exports.normaliseMongoFilter = exports.optionsPaginationParams = exports.messagesREST = exports.CreateResponse = exports.bodyToString = exports.ResponseBodyJSON = exports.ResponseBodyVOFull = exports.ResponseBodyVO = exports.ResponseBodyVOBase = exports.StatusCode = exports.StatusResult = void 0;
 class StatusResult {
 }
 exports.StatusResult = StatusResult;
@@ -61,7 +61,7 @@ StatusCode.Forbidden = 403;
 StatusCode.InternalServerError = 500;
 StatusCode.NotImplemented = 501;
 StatusCode.BadGateway = 502;
-class ResponseBodyVO {
+class ResponseBodyVOBase {
     constructor() {
         this.statusResult = StatusResult.ok;
         this.message = '';
@@ -70,19 +70,35 @@ class ResponseBodyVO {
         this.error = null;
         this.info = null;
         this.identity = null;
+    }
+}
+exports.ResponseBodyVOBase = ResponseBodyVOBase;
+class ResponseBodyVO extends ResponseBodyVOBase {
+    constructor() {
+        super(...arguments);
         this.redirectTo = undefined;
+        this.token = null;
+        this.bodyWrap = true;
     }
 }
 exports.ResponseBodyVO = ResponseBodyVO;
-class ResponseVO {
+class ResponseBodyVOFull extends ResponseBodyVO {
+    constructor() {
+        super(...arguments);
+        this.statusCode = StatusCode.OK;
+    }
+}
+exports.ResponseBodyVOFull = ResponseBodyVOFull;
+class ResponseBodyJSON {
     constructor() {
         this.statusCode = StatusCode.OK;
         this.body = '';
     }
 }
-exports.ResponseVO = ResponseVO;
-class Result {
-    constructor({ statusCode = StatusCode.OK, statusResult = StatusResult.ok, message, data = null, count = null, error = null, info = null, identity = null, redirectTo = undefined, bodyWrap = true, }) {
+exports.ResponseBodyJSON = ResponseBodyJSON;
+class Result extends ResponseBodyVOFull {
+    constructor({ statusCode = StatusCode.OK, statusResult = StatusResult.ok, message, data = null, count = null, error = null, info = null, identity = null, redirectTo = undefined, token = null, bodyWrap = true, }) {
+        super();
         this.statusCode = statusCode;
         this.statusResult = statusResult;
         this.message = !message ? '' : message;
@@ -92,32 +108,35 @@ class Result {
         this.info = info;
         this.identity = identity;
         this.redirectTo = redirectTo;
+        this.token = token;
         this.bodyWrap = bodyWrap;
     }
-    /**
-     * Serverless: According to the API Gateway specs, the body content must be stringified
-     * If use to AWS Appsync need response value without body wrap
-     */
-    bodyToString() {
-        let _err = this.error && this.error.message ? this.error.message : !this.error ? null : JSON.stringify(this.error);
-        const valueBody = {
-            statusResult: this.statusResult,
-            message: this.message,
-            data: this.data,
-            count: this.count,
-            error: _err,
-            info: this.info,
-            identity: this.identity,
-        };
-        if (this.redirectTo)
-            valueBody.redirectTo = this.redirectTo;
-        const valueBodyWrap = {
-            statusCode: this.statusCode,
-            body: JSON.stringify(valueBody),
-        };
-        return this.bodyWrap ? valueBodyWrap : valueBody;
-    }
 }
+/**
+ * Serverless: According to the API Gateway specs, the body content must be stringified
+ * If use to AWS Appsync need response value without body wrap
+ */
+const bodyToString = (result) => {
+    let _err = result.error && result.error.message ? result.error.message : !result.error ? null : JSON.stringify(result.error);
+    const valueBody = {
+        statusResult: result.statusResult,
+        message: result.message,
+        data: result.data,
+        count: result.count,
+        error: _err,
+        info: result.info,
+        identity: result.identity,
+        token: result.token,
+    };
+    if (result.redirectTo)
+        valueBody.redirectTo = result.redirectTo;
+    const valueBodyWrap = {
+        statusCode: result.statusCode,
+        body: JSON.stringify(valueBody),
+    };
+    return result.bodyWrap ? valueBodyWrap : valueBody;
+};
+exports.bodyToString = bodyToString;
 class CreateResponse {
     /**
      * Success
@@ -126,7 +145,7 @@ class CreateResponse {
      * @param message
      * @param bodyWrap
      */
-    static success({ data = null, count = null, message = 'success', bodyWrap = true, info = null, identity = null, }) {
+    static success({ data = null, count = null, message = 'success', bodyWrap = true, info = null, identity = null, token = null, }) {
         const result = new Result({
             statusCode: StatusCode.OK,
             statusResult: StatusResult.ok,
@@ -136,8 +155,9 @@ class CreateResponse {
             bodyWrap,
             info,
             identity,
+            token,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Created
@@ -155,7 +175,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Update
@@ -173,7 +193,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Update or Create
@@ -191,7 +211,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Not Found
@@ -209,7 +229,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Error
@@ -228,7 +248,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Unauthorized
@@ -247,7 +267,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Redirect
@@ -267,7 +287,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Custom
@@ -291,7 +311,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
 }
 exports.CreateResponse = CreateResponse;

package/index.ts

@@ -76,6 +76,7 @@ type TError = any | null
 type TInfo = any | null
 type TIdentity = any | null
 type TRedirectTo = string | undefined
+type TToken = string | null
 
 interface TResultIn {
   statusCode?: StatusCode
@@ -87,7 +88,8 @@ interface TResultIn {
   info?: TInfo
   identity?: TIdentity
   redirectTo?: TRedirectTo
-  bodyWrap: boolean
+  token?: TToken
+  bodyWrap?: boolean
 }
 
 interface TFuncParams {
@@ -100,10 +102,11 @@ interface TFuncParams {
   data?: TData
   count?: TCount
   redirectTo?: TRedirectTo
+  token?: TToken
   bodyWrap?: boolean
 }
 
-export class ResponseBodyVO {
+export class ResponseBodyVOBase {
   statusResult: StatusResult = StatusResult.ok
   message: string = ''
   data: TData = null
@@ -111,28 +114,26 @@ export class ResponseBodyVO {
   error: TError = null
   info: TInfo = null
   identity: TIdentity = null
+}
+
+export class ResponseBodyVO extends ResponseBodyVOBase {
   redirectTo?: TRedirectTo = undefined
+  token?: TToken = null
+  bodyWrap?: boolean = true
 }
 
-export class ResponseVO {
-  statusCode: StatusCode = StatusCode.OK
-  body: string = ''
+export class ResponseBodyVOFull extends ResponseBodyVO {
+  statusCode?: StatusCode = StatusCode.OK
 }
 
-export type ResponseVoAWS = ResponseVO | ResponseBodyVO
+export class ResponseBodyJSON {
+  statusCode?: StatusCode = StatusCode.OK
+  body: string = ''
+}
 
-class Result {
-  private statusCode: StatusCode
-  private statusResult: StatusResult
-  private message: string
-  private data: TData
-  private count: TCount
-  private error: any
-  private info: any
-  private identity: any
-  private redirectTo: TRedirectTo
-  private bodyWrap: boolean
+export type ResponseVoAWS = ResponseBodyJSON | ResponseBodyVO
 
+class Result extends ResponseBodyVOFull {
   constructor({
     statusCode = StatusCode.OK,
     statusResult = StatusResult.ok,
@@ -143,8 +144,10 @@ class Result {
     info = null,
     identity = null,
     redirectTo = undefined,
+    token = null,
     bodyWrap = true,
   }: TResultIn) {
+    super()
     this.statusCode = statusCode
     this.statusResult = statusResult
     this.message = !message ? '' : message
@@ -154,34 +157,38 @@ class Result {
     this.info = info
     this.identity = identity
     this.redirectTo = redirectTo
+    this.token = token
     this.bodyWrap = bodyWrap
-  }
+  } 
+}
+
 
   /**
    * Serverless: According to the API Gateway specs, the body content must be stringified
    * If use to AWS Appsync need response value without body wrap
    */
-  bodyToString(): ResponseVoAWS {
-    let _err = this.error && this.error.message ? this.error.message : !this.error ? null : JSON.stringify(this.error)
-
-    const valueBody: ResponseBodyVO = {
-      statusResult: this.statusResult,
-      message: this.message,
-      data: this.data,
-      count: this.count,
+  export const bodyToString = (result: ResponseBodyVOFull): ResponseVoAWS => {
+    let _err = result.error && result.error.message ? result.error.message : !result.error ? null : JSON.stringify(result.error)
+
+    const valueBody: ResponseBodyVOFull = {
+      statusResult: result.statusResult,
+      message: result.message,
+      data: result.data,
+      count: result.count,
       error: _err,
-      info: this.info,
-      identity: this.identity,
+      info: result.info,
+      identity: result.identity,
+      token: result.token,
     }
-    if (this.redirectTo) valueBody.redirectTo = this.redirectTo
-    const valueBodyWrap: ResponseVO = {
-      statusCode: this.statusCode,
+    if (result.redirectTo) valueBody.redirectTo = result.redirectTo
+    const valueBodyWrap: ResponseBodyJSON = {
+      statusCode: result.statusCode,
       body: JSON.stringify(valueBody),
     }
 
-    return this.bodyWrap ? valueBodyWrap : valueBody
+    return result.bodyWrap ? valueBodyWrap : valueBody
   }
-}
+
 
 export class CreateResponse {
   /**
@@ -198,7 +205,8 @@ export class CreateResponse {
     bodyWrap = true,
     info = null,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+    token = null,
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.OK,
       statusResult: StatusResult.ok,
@@ -208,8 +216,9 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+      token,
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -224,7 +233,7 @@ export class CreateResponse {
     bodyWrap = true,
     info = null,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.Created,
       statusResult: StatusResult.ok,
@@ -233,8 +242,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -249,7 +258,7 @@ export class CreateResponse {
     bodyWrap = true,
     info = null,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.OK,
       statusResult: StatusResult.ok,
@@ -258,8 +267,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -274,7 +283,7 @@ export class CreateResponse {
     bodyWrap = true,
     info = null,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.OK,
       statusResult: StatusResult.ok,
@@ -283,8 +292,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -293,7 +302,7 @@ export class CreateResponse {
    * @param message
    * @param bodyWrap
    */
-  static notFound({ error = null, message = '', bodyWrap = true, identity = null }: TFuncParams): ResponseVoAWS {
+  static notFound({ error = null, message = '', bodyWrap = true, identity = null }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.NotFound,
       statusResult: StatusResult.notFound,
@@ -302,8 +311,8 @@ export class CreateResponse {
       error,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -319,7 +328,7 @@ export class CreateResponse {
     message = 'Error',
     bodyWrap = true,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.error,
@@ -328,8 +337,8 @@ export class CreateResponse {
       message,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -345,7 +354,7 @@ export class CreateResponse {
     message = 'Unauthorized',
     bodyWrap = true,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.unauthorized,
@@ -354,8 +363,8 @@ export class CreateResponse {
       message,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -371,7 +380,7 @@ export class CreateResponse {
     bodyWrap = true,
     redirectTo = '',
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.needRedirect,
@@ -381,8 +390,8 @@ export class CreateResponse {
       redirectTo,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -416,8 +425,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-q-format-response-aws-lambda",
-  "version": "1.0.62",
+  "version": "2.0.2",
   "homepage": "https://github.com/zhukyuri/my-q-format-response-aws-lambda",
   "description": "my-q-format-response-aws-lambda",
   "main": "index.js",