Skip to content

Throw an Error in async functions instead of returning an object #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Throw an Error in async functions instead of returning an object #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 24 additions & 33 deletions src/reverso.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ module.exports = class Reverso {
target = target.toLowerCase()

if (cb && typeof cb !== 'function') {
return {
this.#handleError({
ok: false,
message: 'getContext: cb parameter must be type of function',
}
}, cb)
}

if (
Expand All @@ -65,9 +65,7 @@ module.exports = class Reverso {
message: 'getContext: invalid language passed to the method',
}

if (cb) cb(error)

return error
this.#handleError(error, cb)
}

const response = await this.#request({
Expand All @@ -78,7 +76,7 @@ module.exports = class Reverso {
'/' +
encodeURIComponent(text).replace(/%20/g, '+'),
})
if (!response.success) return this.#handleError(response.error, cb)
if (!response.success) {this.#handleError(response.error, cb)}

const $ = load(response.data)
const sourceDirection =
Expand Down Expand Up @@ -144,10 +142,10 @@ module.exports = class Reverso {
source = source.toLowerCase()

if (cb && typeof cb !== 'function') {
return {
this.#handleError({
ok: false,
message: 'getSpellCheck: cb parameter must be type of function',
}
}, cb)
}

if (!available.spell.find((e) => e === source)) {
Expand All @@ -156,9 +154,7 @@ module.exports = class Reverso {
message: 'getSpellCheck: invalid language passed to the method',
}

if (cb) cb(error)

return error
this.#handleError(error, cb)
}

const languages = {
Expand All @@ -181,13 +177,14 @@ module.exports = class Reverso {
text,
},
})
if (!response.success || !Object.keys(response.data).length)
return this.#handleError(
if (!response.success || !Object.keys(response.data).length) {
this.#handleError(
{
message: 'No result',
},
cb
)
}

const result = {
ok: true,
Expand Down Expand Up @@ -221,10 +218,10 @@ module.exports = class Reverso {
source = source.toLowerCase()

if (cb && typeof cb !== 'function') {
return {
this.#handleError({
ok: false,
message: 'getSynonyms: cb parameter must be type of function',
}
}, cb)
}

if (!available.synonyms.find((e) => e === source)) {
Expand All @@ -233,9 +230,7 @@ module.exports = class Reverso {
message: 'getSynonyms: invalid language passed to the method',
}

if (cb) cb(error)

return error
this.#handleError(error, cb)
}

const languages = {
Expand All @@ -262,7 +257,7 @@ module.exports = class Reverso {
'/' +
encodeURIComponent(text),
})
if (!response.success) return this.#handleError(response.error, cb)
if (!response.success) {this.#handleError(response.error, cb)}

const $ = load(response.data)

Expand Down Expand Up @@ -306,11 +301,11 @@ module.exports = class Reverso {
target = target.toLowerCase()

if (cb && typeof cb !== 'function') {
return {
this.#handleError({
ok: false,
message:
'getTranslation: cb parameter must be type of function',
}
}, cb)
}

if (
Expand All @@ -324,9 +319,7 @@ module.exports = class Reverso {
'getTranslation: invalid language passed to the method',
}

if (cb) cb(error)

return error
this.#handleError(error, cb)
}

const languages = {
Expand Down Expand Up @@ -385,7 +378,7 @@ module.exports = class Reverso {
to: languages[target],
},
})
if (!response.success) return this.#handleError(response.error, cb)
if (!response.success) {this.#handleError(response.error, cb)}

const translationEncoded = toBase64(response.data.translation[0])

Expand Down Expand Up @@ -455,11 +448,11 @@ module.exports = class Reverso {
source = source.toLowerCase()

if (cb && typeof cb !== 'function') {
return {
this.#handleError({
ok: false,
message:
'getConjugation: cb parameter must be type of function',
}
}, cb)
}

if (!available.conjugation.find((e) => e === source)) {
Expand All @@ -469,9 +462,7 @@ module.exports = class Reverso {
'getConjugation: invalid language passed to the method',
}

if (cb) cb(error)

return error
this.#handleError(error, cb)
}

const response = await this.#request({
Expand All @@ -483,7 +474,7 @@ module.exports = class Reverso {
encodeURIComponent(text) +
'.html',
})
if (!response.success) return this.#handleError(response.error, cb)
if (!response.success) {this.#handleError(response.error, cb)}

const $ = load(response.data)

Expand Down Expand Up @@ -560,7 +551,7 @@ module.exports = class Reverso {
/**
* @param error
* @param cb
* @returns {{ok: boolean, message}}
* @throws
*/
#handleError(error, cb) {
error = {
Expand All @@ -569,6 +560,6 @@ module.exports = class Reverso {
}

if (cb) cb(error)
return error
throw new Error(error.message);
}
}