Merge branch 'develop' into deepsource-autofix-7fc1aff8

README.md

@@ -0,0 +1,2 @@
+[![DeepSource](https://app.deepsource.com/gh/Adapcon/adapcon-utils-js.svg/?label=active+issues&show_trend=true&token=z9o0q95BRMd2RWNUS_SdBYs0)](https://app.deepsource.com/gh/Adapcon/adapcon-utils-js/?ref=repository-badge)
+[![DeepSource](https://app.deepsource.com/gh/Adapcon/adapcon-utils-js.svg/?label=resolved+issues&show_trend=true&token=z9o0q95BRMd2RWNUS_SdBYs0)](https://app.deepsource.com/gh/Adapcon/adapcon-utils-js/?ref=repository-badge)

__tests__/files/index.test.ts

@@ -0,0 +1,11 @@
+import { getExtensionFromMimeType } from '../../src/files'
+
+describe('Files', () => {
+  it('Should correct file extension from mimeType', () => {
+    expect(getExtensionFromMimeType('video/mp4')).toEqual('mp4')
+  })
+
+  it('Should return null as mimeType is unkown', () => {
+    expect(getExtensionFromMimeType('log/banana')).toBeNull()
+  })
+})

__tests__/lambda/formatters.test.ts

@@ -8,6 +8,20 @@ describe('invoke', () => {
     })).toEqual({ body: { error: 'Invalid Session' }, status: 401 })
   })
 
+  it('Should returns response formatted with headers', () => {
+    expect(formattedResponse({
+      StatusCode: 200,
+      Payload: '{"headers": {"total-count":"20"}}'
+    })).toEqual({ headers: { 'total-count': '20' }, status: 200, body: {} })
+  })
+
+  it('Should returns response formatted with headers and body', () => {
+    expect(formattedResponse({
+      StatusCode: 200,
+      Payload: '{"headers": {"total-count":"20"},"body": "{\\"name\\":\\"John Doe\\"}"}'
+    })).toEqual({ headers: { 'total-count': '20' }, status: 200, body: { name: 'John Doe' } })
+  })
+
   it('Should returns response formatted with status code 200', () => {
     expect(formattedResponse({
       StatusCode: 200,

__tests__/lambda/lambdaGetParameters.test.ts

@@ -23,6 +23,24 @@ describe('lambdaGetParameters', () => {
         date: 1639423222426
       }
     },
+    {
+      event: {
+        pathParameters: {
+          auth: 'xyz',
+          app: 'theAppId'
+        },
+        queryStringParameters: null
+      },
+      eventParams: {
+        auth: 'pathParameters',
+        app: 'pathParameters',
+        date: 'queryStringParameters'
+      },
+      output: {
+        auth: 'xyz',
+        app: 'theAppId'
+      }
+    },
     {
       event: {
         pathParameters: {

__tests__/lambda/lambdaResponses.test.ts

@@ -35,11 +35,23 @@ describe('lambdaResp', () => {
         statusCode: 404,
         body: 'not found!'
       }
+    },
+    {
+      input: {
+        statusCode: 200,
+        body: '',
+        headers: { 'total-count': 42069 }
+      },
+      output: {
+        statusCode: 200,
+        body: '',
+        headers: { 'total-count': 42069 }
+      }
     }
   ]
 
   test.each(data)('Should return an response Object, with statusCode and body props', (param) => {
-    expect(lambdaResp(param.input.statusCode, param.input.body)).toStrictEqual(param.output)
+    expect(lambdaResp(param.input.statusCode, param.input.body, param.input.headers)).toStrictEqual(param.output)
   })
 })
 

__tests__/string/modifiers.test.ts

@@ -0,0 +1,43 @@
+import { stringToArray } from '../../src/string'
+
+describe('stringToArray', () => {
+  const data = [
+    {
+      output: []
+    },
+    {
+      delimiter: ',',
+      output: []
+    },
+    {
+      input: 'id,style,appId',
+      output: ['id', 'style', 'appId']
+    },
+    {
+      input: 'id, style, appId',
+      output: ['id', 'style', 'appId']
+    },
+    {
+      input: '',
+      output: []
+    },
+    {
+      input: 'id',
+      output: ['id']
+    },
+    {
+      input: 'id',
+      delimiter: ',',
+      output: ['id']
+    },
+    {
+      input: 'id;style;appId',
+      delimiter: ';',
+      output: ['id', 'style', 'appId']
+    }
+  ]
+
+  test.each(data)('Should return array of string', (param) => {
+    expect(stringToArray(param.input ? param.input : undefined, param.delimiter ? param.delimiter : undefined)).toStrictEqual(param.output)
+  })
+})

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapcon-utils-js",
-  "version": "0.15.1",
+  "version": "0.16.7",
   "description": "Utils library for Javascript",
   "keywords": [],
   "author": {
@@ -57,6 +57,6 @@
     "typescript": "^4.4.2"
   },
   "engines": {
-    "node": "14.x"
+    "node": ">=14.x"
   }
 }

src/files/extensions.ts

@@ -0,0 +1,28 @@
+export enum FILE_EXTENSIONS {
+  'video/mp4' = 'mp4',
+  'audio/ogg; codecs=opus' = 'ogg',
+  'image/gif' = 'gif',
+  'image/jpeg' = 'jpg',
+  'image/svg+xml' = 'svg',
+  'image/tiff' = 'tiff',
+  'image/png' = 'png',
+  'image/bmp' = 'bmp',
+  'text/html' = 'html',
+  'text/csv' = 'csv',
+  'text/css' = 'css',
+  'text/plain' = 'txt',
+  'text/xml' = 'xml',
+  'text/tab-separated-values' = 'tsv',
+  'application/pdf' = 'pdf',
+  'application/xml' = 'xml',
+  'application/zip' = 'zip',
+  'application/x-compressed-zip' = 'zip',
+  'application/vnd.ms-excel' = 'xls',
+  'application/x-bzip2' = 'bz2',
+  'application/msword' = 'doc',
+  'application/x-gzip' = 'gz',
+  'application/java-archive' = 'jar',
+  'application/x-javascript' = 'js',
+  'application/vnd.ms-powerpoint' = 'ppt',
+  'application/x-tar' = 'tar.gz'
+}

src/files/index.ts

@@ -0,0 +1,2 @@
+export * from './extensions'
+export * from './utils'

src/files/utils.ts

@@ -0,0 +1,5 @@
+import { FILE_EXTENSIONS } from '.'
+
+export function getExtensionFromMimeType (mimeType: string): string | null {
+  return FILE_EXTENSIONS[mimeType] || null
+}

src/http/enums.ts

@@ -20,13 +20,15 @@ export enum HttpStatuses {
   created = 201,
   accepted = 202,
   noContent = 204,
+  partialContent = 206,
   badRequest = 400,
   unauthorized = 401,
   invalidSession = 401,
   forbidden = 403,
   notFound = 404,
   userNotFound = 404,
   integrationError = 406,
+  preconditionFailed = 412,
   teaPot = 418,
   unprocessableEntity = 422,
   internalError = 500,

src/index.ts

@@ -4,6 +4,7 @@ export * from './date'
 export * from './dynamoose'
 export * from './email'
 export * from './error'
+export * from './files'
 export * from './http'
 export * from './image'
 export * from './invoice'

src/lambda/formatters.ts

@@ -2,12 +2,13 @@ import jsonBigInt from 'json-bigint'
 
 import { isObject } from '../object'
 
-export const formattedResponse = ({ StatusCode, Payload }: { StatusCode?: any, Payload?: any }): object => {
+export const formattedResponse = ({ StatusCode, Payload }: { StatusCode?: number, Payload?: any }): object => {
   const payloadFormatted = JSON.parse(Payload || '{}')
 
   return {
     status: payloadFormatted.statusCode || StatusCode,
-    body: payloadFormatted.body ? JSON.parse(payloadFormatted.body) : {}
+    body: payloadFormatted.body ? JSON.parse(payloadFormatted.body) : {},
+    ...(payloadFormatted.headers ? { headers: payloadFormatted.headers } : null)
   }
 }
 

src/lambda/interfaces.ts

@@ -7,6 +7,10 @@ export interface Error {
   message?: string
 }
 
+export type Headers = {
+  [header: string]: string | number | boolean
+}
+
 export interface lambdaParameters {
   port?: string
   region?: string

src/lambda/lambdaGetParameters.ts

@@ -2,11 +2,12 @@ import { kebabCaseToCamelCase } from './../string/formatters'
 export const lambdaGetParameters = (event: object, eventParams: object): { [key: string]: any } => {
   const fedParams = {}
 
-  for (const element in eventParams) {
+  for (const element of Object.keys(eventParams)) {
     const path: string = eventParams[element]
 
     if (path in event) {
       const eventPathObject: object = event[path]
+      if (!eventPathObject) continue
       const fedParam: any = path === 'body' ? eventPathObject : eventPathObject[element]
       let paramKey: string = element
       if (path === 'headers') {

src/lambda/lambdaResponses.ts

@@ -1,11 +1,12 @@
 import { isNumber } from '../number'
 import { objToStr } from '../object'
 import { ProxyResult } from 'aws-lambda'
-import type { Error } from './interfaces'
+import type { Error, Headers } from './interfaces'
 
-export const lambdaResp = (statusCode: number, body?: object | string): ProxyResult => ({
+export const lambdaResp = (statusCode: number, body?: object | string, headers?: Headers): ProxyResult => ({
   statusCode,
-  ...(body ? { body: objToStr(body) } : { body: '' })
+  ...(body ? { body: objToStr(body) } : { body: '' }),
+  ...(headers ? { headers } : null)
 })
 
 export const lambdaRespError = (err: Error): ProxyResult => {

src/string/index.ts

@@ -1,2 +1,3 @@
 export * from './validators'
 export * from './formatters'
+export * from './modifiers'

src/string/modifiers.ts

@@ -0,0 +1,4 @@
+export const stringToArray = (str = '', delimiter = ','): string[] => {
+  if (typeof str !== 'string' || str === '') return []
+  return str.split(delimiter).map((value) => value.trim())
+}