1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-09 21:30:05 +00:00

chore: refactor code for getValidJson function

This commit is contained in:
2021-08-18 00:02:48 +05:00
parent 47fe7686cb
commit 0bc69401e5
2 changed files with 12 additions and 14 deletions

View File

@@ -1,4 +1,5 @@
import { getValidJson } from '../../utils' import { getValidJson } from '../../utils'
import { JsonParseArrayError, InvalidJsonError } from '../../types/errors'
describe('jsonValidator', () => { describe('jsonValidator', () => {
it('should not throw an error with a valid json', () => { it('should not throw an error with a valid json', () => {
@@ -19,23 +20,17 @@ describe('jsonValidator', () => {
it('should throw an error with an invalid json', () => { it('should throw an error with an invalid json', () => {
const json = `{\"test\":\"test\"\"test2\":\"test\"}` const json = `{\"test\":\"test\"\"test2\":\"test\"}`
let errorThrown = false const test = () => {
try {
getValidJson(json) getValidJson(json)
} catch (error) {
errorThrown = true
} }
expect(errorThrown).toBe(true) expect(test).toThrowError(InvalidJsonError)
}) })
it('should throw an error when an array is passed', () => { it('should throw an error when an array is passed', () => {
const array = ['hello', 'world'] const array = ['hello', 'world']
let errorThrown = false const test = () => {
try {
getValidJson(array) getValidJson(array)
} catch (error) {
errorThrown = true
} }
expect(errorThrown).toBe(true) expect(test).toThrow(JsonParseArrayError)
}) })
}) })

View File

@@ -1,16 +1,19 @@
import { JsonParseArrayError, InvalidJsonError } from '../types/errors'
/** /**
* if string passed then parse the string to json else if throw error for all other types unless it is not a valid json object. * if string passed then parse the string to json else if throw error for all other types unless it is not a valid json object.
* @param str - string to check. * @param str - string to check.
*/ */
export const getValidJson = (str: string | object) => { export const getValidJson = (str: string | object) => {
try { try {
if (Array.isArray(str)) { const arrayErrorMessage = 'Can not parse array object to json.'
throw new Error('Can not parse array object to json.') if (Array.isArray(str)) throw new JsonParseArrayError(arrayErrorMessage)
}
if (typeof str === 'object') return str if (typeof str === 'object') return str
return JSON.parse(str) return JSON.parse(str)
} catch (e) { } catch (e) {
throw new Error('Invalid JSON response.') if (e instanceof JsonParseArrayError) throw e
throw new InvalidJsonError()
} }
} }