Skip to content

Commit 81c3de4

Browse files
akanassakanass
authored
Merge pull request #4 from hapinessjs/next
release(version): v1.1.0
2 parents abafd97 + 75d1c02 commit 81c3de4

4 files changed

Lines changed: 265 additions & 39 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ $ yarn add @hapiness/biim
5858

5959
```javascript
6060
"dependencies": {
61-
"@hapiness/core": "^1.0.0-rc.6",
62-
"@hapiness/biim": "^1.0.0-rc.6",
61+
"@hapiness/biim": "^1.1.0",
6362
//...
6463
}
6564
//...
@@ -79,10 +78,13 @@ Biim.badRequest('my-message', 'some-data', { key: 'bad-request' });
7978

8079
## Change History
8180

81+
* v1.1.0
82+
* Improve error instantiation.
83+
* Update unit tests.
8284
* v1.0.0
83-
* Final release version
85+
* Final release version.
8486
* v1.0.0-rc.6 (2017-07-16)
85-
* Init the project
87+
* Init the project.
8688

8789
[Back to top](#table-of-contents)
8890

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hapiness/biim",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "Error Library to use it inside Hapiness framework or standalone using Boom",
55
"main": "index.js",
66
"types": "index.d.ts",

‎src/index.ts‎

Lines changed: 203 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,160 +13,332 @@ export class Biim {
1313
}
1414

1515
static wrap(error: Error, statusCode?: number, message?: string, payload?: any): BiimError {
16-
return this.dataInPayload(Boom.wrap.apply(Boom, arguments), payload);
16+
// get args array
17+
const args = [...arguments];
18+
// delete payload if exists
19+
if (args.length === 4) {
20+
args.pop();
21+
}
22+
return this.dataInPayload(Boom.wrap.apply(Boom, args), payload);
1723
}
1824

1925

2026
static create(statusCode: number, message?: string, data?: any, payload?: any): BiimError {
27+
// get args array
28+
const args = [...arguments];
29+
// delete payload if exists
30+
if (args.length === 4) {
31+
args.pop();
32+
}
2133
return this.dataInPayload(Boom.create.apply(Boom, arguments), payload);
2234
}
2335

2436

2537
static badRequest(message?: string, data?: any, payload?: any): BiimError {
26-
return this.dataInPayload(Boom.badRequest.apply(Boom, arguments), payload);
38+
// get args array
39+
const args = [...arguments];
40+
// delete payload if exists
41+
if (args.length === 3) {
42+
args.pop();
43+
}
44+
return this.dataInPayload(Boom.badRequest.apply(Boom, args), payload);
2745
}
2846

2947

3048
static unauthorized(message?: string, scheme?: any, attributes?: any, payload?: any): BiimError {
31-
return this.dataInPayload(Boom.unauthorized.apply(Boom, arguments), payload);
49+
// get args array
50+
const args = [...arguments];
51+
// delete payload if exists
52+
if (args.length === 4) {
53+
args.pop();
54+
}
55+
return this.dataInPayload(Boom.unauthorized.apply(Boom, args), payload);
3256
}
3357

3458

3559
static paymentRequired(message?: string, data?: any, payload?: any): BiimError {
36-
return this.dataInPayload(Boom['paymentRequired'].apply(Boom, arguments), payload);
60+
// get args array
61+
const args = [...arguments];
62+
// delete payload if exists
63+
if (args.length === 3) {
64+
args.pop();
65+
}
66+
return this.dataInPayload(Boom['paymentRequired'].apply(Boom, args), payload);
3767
}
3868

3969

4070
static forbidden(message?: string, data?: any, payload?: any): BiimError {
41-
return this.dataInPayload(Boom.forbidden.apply(Boom, arguments), payload);
71+
// get args array
72+
const args = [...arguments];
73+
// delete payload if exists
74+
if (args.length === 3) {
75+
args.pop();
76+
}
77+
return this.dataInPayload(Boom.forbidden.apply(Boom, args), payload);
4278
}
4379

4480

4581
static notFound(message?: string, data?: any, payload?: any): BiimError {
46-
return this.dataInPayload(Boom.notFound.apply(Boom, arguments), payload);
82+
// get args array
83+
const args = [...arguments];
84+
// delete payload if exists
85+
if (args.length === 3) {
86+
args.pop();
87+
}
88+
return this.dataInPayload(Boom.notFound.apply(Boom, args), payload);
4789
}
4890

4991

5092
static methodNotAllowed(message?: string, data?: any, allow?: string | string[], payload?: any): BiimError {
51-
return this.dataInPayload(Boom.methodNotAllowed.apply(Boom, arguments), payload);
93+
// get args array
94+
const args = [...arguments];
95+
// delete payload if exists
96+
if (args.length === 4) {
97+
args.pop();
98+
}
99+
return this.dataInPayload(Boom.methodNotAllowed.apply(Boom, args), payload);
52100
}
53101

54102

55103
static notAcceptable(message?: string, data?: any, payload?: any): BiimError {
56-
return this.dataInPayload(Boom.notAcceptable.apply(Boom, arguments), payload);
104+
// get args array
105+
const args = [...arguments];
106+
// delete payload if exists
107+
if (args.length === 3) {
108+
args.pop();
109+
}
110+
return this.dataInPayload(Boom.notAcceptable.apply(Boom, args), payload);
57111
}
58112

59113

60114
static proxyAuthRequired(message?: string, data?: any, payload?: any): BiimError {
61-
return this.dataInPayload(Boom.proxyAuthRequired.apply(Boom, arguments), payload);
115+
// get args array
116+
const args = [...arguments];
117+
// delete payload if exists
118+
if (args.length === 3) {
119+
args.pop();
120+
}
121+
return this.dataInPayload(Boom.proxyAuthRequired.apply(Boom, args), payload);
62122
}
63123

64124

65125
static clientTimeout(message?: string, data?: any, payload?: any): BiimError {
66-
return this.dataInPayload(Boom.clientTimeout.apply(Boom, arguments), payload);
126+
// get args array
127+
const args = [...arguments];
128+
// delete payload if exists
129+
if (args.length === 3) {
130+
args.pop();
131+
}
132+
return this.dataInPayload(Boom.clientTimeout.apply(Boom, args), payload);
67133
}
68134

69135

70136
static conflict(message?: string, data?: any, payload?: any): BiimError {
71-
return this.dataInPayload(Boom.conflict.apply(Boom, arguments), payload);
137+
// get args array
138+
const args = [...arguments];
139+
// delete payload if exists
140+
if (args.length === 3) {
141+
args.pop();
142+
}
143+
return this.dataInPayload(Boom.conflict.apply(Boom, args), payload);
72144
}
73145

74146

75147
static resourceGone(message?: string, data?: any, payload?: any): BiimError {
76-
return this.dataInPayload(Boom.resourceGone.apply(Boom, arguments), payload);
148+
const args = [...arguments];
149+
// delete payload if exists
150+
if (args.length === 3) {
151+
args.pop();
152+
}
153+
return this.dataInPayload(Boom.resourceGone.apply(Boom, args), payload);
77154
}
78155

79156

80157
static lengthRequired(message?: string, data?: any, payload?: any): BiimError {
81-
return this.dataInPayload(Boom.lengthRequired.apply(Boom, arguments), payload);
158+
const args = [...arguments];
159+
// delete payload if exists
160+
if (args.length === 3) {
161+
args.pop();
162+
}
163+
return this.dataInPayload(Boom.lengthRequired.apply(Boom, args), payload);
82164
}
83165

84166

85167
static preconditionFailed(message?: string, data?: any, payload?: any): BiimError {
86-
return this.dataInPayload(Boom.preconditionFailed.apply(Boom, arguments), payload);
168+
const args = [...arguments];
169+
// delete payload if exists
170+
if (args.length === 3) {
171+
args.pop();
172+
}
173+
return this.dataInPayload(Boom.preconditionFailed.apply(Boom, args), payload);
87174
}
88175

89176

90177
static entityTooLarge(message?: string, data?: any, payload?: any): BiimError {
91-
return this.dataInPayload(Boom.entityTooLarge.apply(Boom, arguments), payload);
178+
const args = [...arguments];
179+
// delete payload if exists
180+
if (args.length === 3) {
181+
args.pop();
182+
}
183+
return this.dataInPayload(Boom.entityTooLarge.apply(Boom, args), payload);
92184
}
93185

94186

95187
static uriTooLong(message?: string, data?: any, payload?: any): BiimError {
96-
return this.dataInPayload(Boom.uriTooLong.apply(Boom, arguments), payload);
188+
const args = [...arguments];
189+
// delete payload if exists
190+
if (args.length === 3) {
191+
args.pop();
192+
}
193+
return this.dataInPayload(Boom.uriTooLong.apply(Boom, args), payload);
97194
}
98195

99196

100197
static unsupportedMediaType(message?: string, data?: any, payload?: any): BiimError {
101-
return this.dataInPayload(Boom.unsupportedMediaType.apply(Boom, arguments), payload);
198+
const args = [...arguments];
199+
// delete payload if exists
200+
if (args.length === 3) {
201+
args.pop();
202+
}
203+
return this.dataInPayload(Boom.unsupportedMediaType.apply(Boom, args), payload);
102204
}
103205

104206

105207
static rangeNotSatisfiable(message?: string, data?: any, payload?: any): BiimError {
106-
return this.dataInPayload(Boom.rangeNotSatisfiable.apply(Boom, arguments), payload);
208+
const args = [...arguments];
209+
// delete payload if exists
210+
if (args.length === 3) {
211+
args.pop();
212+
}
213+
return this.dataInPayload(Boom.rangeNotSatisfiable.apply(Boom, args), payload);
107214
}
108215

109216

110217
static expectationFailed(message?: string, data?: any, payload?: any): BiimError {
111-
return this.dataInPayload(Boom.expectationFailed.apply(Boom, arguments), payload);
218+
const args = [...arguments];
219+
// delete payload if exists
220+
if (args.length === 3) {
221+
args.pop();
222+
}
223+
return this.dataInPayload(Boom.expectationFailed.apply(Boom, args), payload);
112224
}
113225

114226

115227
static teapot(message?: string, data?: any, payload?: any): BiimError {
116-
return this.dataInPayload(Boom.teapot.apply(Boom, arguments), payload);
228+
const args = [...arguments];
229+
// delete payload if exists
230+
if (args.length === 3) {
231+
args.pop();
232+
}
233+
return this.dataInPayload(Boom.teapot.apply(Boom, args), payload);
117234
}
118235

119236

120237
static badData(message?: string, data?: any, payload?: any): BiimError {
121-
return this.dataInPayload(Boom.badData.apply(Boom, arguments), payload);
238+
const args = [...arguments];
239+
// delete payload if exists
240+
if (args.length === 3) {
241+
args.pop();
242+
}
243+
return this.dataInPayload(Boom.badData.apply(Boom, args), payload);
122244
}
123245

124246

125247
static locked(message?: string, data?: any, payload?: any): BiimError {
126-
return this.dataInPayload(Boom.locked.apply(Boom, arguments), payload);
248+
const args = [...arguments];
249+
// delete payload if exists
250+
if (args.length === 3) {
251+
args.pop();
252+
}
253+
return this.dataInPayload(Boom.locked.apply(Boom, args), payload);
127254
}
128255

129256

130257
static preconditionRequired(message?: string, data?: any, payload?: any): BiimError {
131-
return this.dataInPayload(Boom.preconditionRequired.apply(Boom, arguments), payload);
258+
const args = [...arguments];
259+
// delete payload if exists
260+
if (args.length === 3) {
261+
args.pop();
262+
}
263+
return this.dataInPayload(Boom.preconditionRequired.apply(Boom, args), payload);
132264
}
133265

134266

135267
static tooManyRequests(message?: string, data?: any, payload?: any): BiimError {
136-
return this.dataInPayload(Boom.tooManyRequests.apply(Boom, arguments), payload);
268+
const args = [...arguments];
269+
// delete payload if exists
270+
if (args.length === 3) {
271+
args.pop();
272+
}
273+
return this.dataInPayload(Boom.tooManyRequests.apply(Boom, args), payload);
137274
}
138275

139276

140277
static illegal(message?: string, data?: any, payload?: any): BiimError {
141-
return this.dataInPayload(Boom.illegal.apply(Boom, arguments), payload);
278+
const args = [...arguments];
279+
// delete payload if exists
280+
if (args.length === 3) {
281+
args.pop();
282+
}
283+
return this.dataInPayload(Boom.illegal.apply(Boom, args), payload);
142284
}
143285

144286

145287
static internal(message?: string, data?: any, statusCode?: number, payload?: any): BiimError {
146-
return this.dataInPayload(Boom.internal.apply(Boom, arguments), payload);
288+
const args = [...arguments];
289+
// delete payload if exists
290+
if (args.length === 4) {
291+
args.pop();
292+
}
293+
return this.dataInPayload(Boom.internal.apply(Boom, args), payload);
147294
}
148295

149296
static notImplemented(message?: string, data?: any, payload?: any): BiimError {
150-
return this.dataInPayload(Boom.notImplemented.apply(Boom, arguments), payload);
297+
const args = [...arguments];
298+
// delete payload if exists
299+
if (args.length === 3) {
300+
args.pop();
301+
}
302+
return this.dataInPayload(Boom.notImplemented.apply(Boom, args), payload);
151303
}
152304

153305

154306
static badGateway(message?: string, data?: any, payload?: any): BiimError {
155-
return this.dataInPayload(Boom.badGateway.apply(Boom, arguments), payload);
307+
const args = [...arguments];
308+
// delete payload if exists
309+
if (args.length === 3) {
310+
args.pop();
311+
}
312+
return this.dataInPayload(Boom.badGateway.apply(Boom, args), payload);
156313
}
157314

158315

159316
static serverUnavailable(message?: string, data?: any, payload?: any): BiimError {
160-
return this.dataInPayload(Boom.serverUnavailable.apply(Boom, arguments), payload);
317+
const args = [...arguments];
318+
// delete payload if exists
319+
if (args.length === 3) {
320+
args.pop();
321+
}
322+
return this.dataInPayload(Boom.serverUnavailable.apply(Boom, args), payload);
161323
}
162324

163325

164326
static gatewayTimeout(message?: string, data?: any, payload?: any): BiimError {
165-
return this.dataInPayload(Boom.gatewayTimeout.apply(Boom, arguments), payload);
327+
const args = [...arguments];
328+
// delete payload if exists
329+
if (args.length === 3) {
330+
args.pop();
331+
}
332+
return this.dataInPayload(Boom.gatewayTimeout.apply(Boom, args), payload);
166333
}
167334

168335

169336
static badImplementation(message?: string, data?: any, payload?: any): BiimError {
170-
return this.dataInPayload(Boom.badImplementation.apply(Boom, arguments), payload);
337+
const args = [...arguments];
338+
// delete payload if exists
339+
if (args.length === 3) {
340+
args.pop();
341+
}
342+
return this.dataInPayload(Boom.badImplementation.apply(Boom, args), payload);
171343
}
172344
}

0 commit comments

Comments
 (0)