my-q-format-response-aws-lambda 1.0.63 → 2.0.3

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,20 +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 {
+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;
@@ -96,31 +111,32 @@ class Result {
         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,
-            token: this.token,
-        };
-        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
@@ -141,7 +157,7 @@ class CreateResponse {
             identity,
             token,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Created
@@ -159,7 +175,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Update
@@ -177,7 +193,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Update or Create
@@ -195,7 +211,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Not Found
@@ -213,7 +229,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Error
@@ -232,7 +248,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Unauthorized
@@ -251,7 +267,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Redirect
@@ -271,7 +287,7 @@ class CreateResponse {
             bodyWrap,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
     /**
      * Custom
@@ -295,7 +311,7 @@ class CreateResponse {
             info,
             identity,
         });
-        return result.bodyToString();
+        return result;
     }
 }
 exports.CreateResponse = CreateResponse;
@@ -404,6 +420,12 @@ const messagesREST = (prefix, suffix = '') => {
         MARK_SYSTEM: `${prefix}_MARK_SYSTEM${suffix}`,
         NOT_MARK_SYSTEM: `${prefix}_NOT_MARK_SYSTEM${suffix}`,
         ERROR_MARK_SYSTEM: `${prefix}_ERROR_MARK_SYSTEM${suffix}`,
+        GENERATE_PDF: `${prefix}_GENERATE_PDF${suffix}`,
+        NOT_GENERATE_PDF: `${prefix}_NOT_MGENERATE_PDF${suffix}`,
+        ERROR_GENERATE_PDF: `${prefix}_ERROR_GENERATE_PDF${suffix}`,
+        GENERATE_XLS: `${prefix}_GENERATE_PDF${suffix}`,
+        NOT_GENERATE_XLS: `${prefix}_NOT_MGENERATE_XLS${suffix}`,
+        ERROR_GENERATE_XLS: `${prefix}_ERROR_GENERATE_XLS${suffix}`,
     };
 };
 exports.messagesREST = messagesREST;

package/index.ts

@@ -89,7 +89,7 @@ interface TResultIn {
   identity?: TIdentity
   redirectTo?: TRedirectTo
   token?: TToken
-  bodyWrap: boolean
+  bodyWrap?: boolean
 }
 
 interface TFuncParams {
@@ -106,7 +106,7 @@ interface TFuncParams {
   bodyWrap?: boolean
 }
 
-export class ResponseBodyVO {
+export class ResponseBodyVOBase {
   statusResult: StatusResult = StatusResult.ok
   message: string = ''
   data: TData = null
@@ -114,30 +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
+export class ResponseBodyVOFull extends ResponseBodyVO {
+  statusCode?: StatusCode = StatusCode.OK
+}
+
+export class ResponseBodyJSON {
+  statusCode?: StatusCode = StatusCode.OK
   body: string = ''
 }
 
-export type ResponseVoAWS = ResponseVO | ResponseBodyVO
-
-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 token: TToken
-  private bodyWrap: boolean
+export type ResponseVoAWS = ResponseBodyJSON | ResponseBodyVO
 
+class Result extends ResponseBodyVOFull {
   constructor({
     statusCode = StatusCode.OK,
     statusResult = StatusResult.ok,
@@ -151,6 +147,7 @@ class Result {
     token = null,
     bodyWrap = true,
   }: TResultIn) {
+    super()
     this.statusCode = statusCode
     this.statusResult = statusResult
     this.message = !message ? '' : message
@@ -162,34 +159,36 @@ class Result {
     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,
-      token: this.token,
+      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 {
   /**
@@ -207,7 +206,7 @@ export class CreateResponse {
     info = null,
     identity = null,
     token = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode: StatusCode.OK,
       statusResult: StatusResult.ok,
@@ -218,8 +217,8 @@ export class CreateResponse {
       info,
       identity,
       token,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -234,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,
@@ -243,8 +242,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -259,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,
@@ -268,8 +267,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -284,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,
@@ -293,8 +292,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -303,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,
@@ -312,8 +311,8 @@ export class CreateResponse {
       error,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -329,7 +328,7 @@ export class CreateResponse {
     message = 'Error',
     bodyWrap = true,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.error,
@@ -338,8 +337,8 @@ export class CreateResponse {
       message,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -355,7 +354,7 @@ export class CreateResponse {
     message = 'Unauthorized',
     bodyWrap = true,
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.unauthorized,
@@ -364,8 +363,8 @@ export class CreateResponse {
       message,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -381,7 +380,7 @@ export class CreateResponse {
     bodyWrap = true,
     redirectTo = '',
     identity = null,
-  }: TFuncParams): ResponseVoAWS {
+  }: TFuncParams): ResponseBodyVO {
     const result = new Result({
       statusCode,
       statusResult: StatusResult.needRedirect,
@@ -391,8 +390,8 @@ export class CreateResponse {
       redirectTo,
       bodyWrap,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 
   /**
@@ -426,8 +425,8 @@ export class CreateResponse {
       bodyWrap,
       info,
       identity,
-    })
-    return result.bodyToString()
+    }) as ResponseBodyVOFull
+    return result
   }
 }
 
@@ -572,6 +571,14 @@ export const messagesREST = (prefix: string, suffix: string = ''): Record<string
     MARK_SYSTEM: `${prefix}_MARK_SYSTEM${suffix}`,
     NOT_MARK_SYSTEM: `${prefix}_NOT_MARK_SYSTEM${suffix}`,
     ERROR_MARK_SYSTEM: `${prefix}_ERROR_MARK_SYSTEM${suffix}`,
+
+    GENERATE_PDF: `${prefix}_GENERATE_PDF${suffix}`,
+    NOT_GENERATE_PDF: `${prefix}_NOT_MGENERATE_PDF${suffix}`,
+    ERROR_GENERATE_PDF: `${prefix}_ERROR_GENERATE_PDF${suffix}`,
+
+    GENERATE_XLS: `${prefix}_GENERATE_PDF${suffix}`,
+    NOT_GENERATE_XLS: `${prefix}_NOT_MGENERATE_XLS${suffix}`,
+    ERROR_GENERATE_XLS: `${prefix}_ERROR_GENERATE_XLS${suffix}`,
   }
 }
 

package/package.json

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