Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit da4774f

Browse files
hueniversehueniverse
committed
Replace v16 compatibility interface. Closes #2047 
1 parent e14321f commit da4774f

File tree

9 files changed

+34
-59
lines changed

9 files changed

+34
-59
lines changed

‎.editorconfig‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.eslintignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/conditionalRequire.js‎

100644100755
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ const schema = Joi.object().keys({
2626
.when('q2', { is: true, then: Joi.valid('1-5', '6-10', '11-50', '50+').required() }),
2727
// Rate 20% of most friendly Parisians, from how many people you know answered in q3, individually on 1-5 rating
2828
q4: Joi.array()
29-
.when('q3', {is: '1-5', then: Joi.array().min(0).max(1).items(intRating).required() })
30-
.when('q3', {is: '6-10', then: Joi.array().min(1).max(2).items(intRating).required() })
31-
.when('q3', {is: '11-50', then: Joi.array().min(2).max(10).items(intRating).required() })
32-
.when('q3', {is: '50+', then: Joi.array().min(10).items(intRating).required() }),
29+
.when('q3', { is: '1-5', then: Joi.array().min(0).max(1).items(intRating).required() })
30+
.when('q3', { is: '6-10', then: Joi.array().min(1).max(2).items(intRating).required() })
31+
.when('q3', { is: '11-50', then: Joi.array().min(2).max(10).items(intRating).required() })
32+
.when('q3', { is: '50+', then: Joi.array().min(10).items(intRating).required() }),
3333
// Rate remaining 80% of Parisians, from how many people you know answered in q3, individually on 1-5 rating
3434
q5: Joi.array()
35-
.when('q3', {is: '1-5', then: Joi.array().min(1).max(4).items(intRating).required() })
36-
.when('q3', {is: '6-10', then: Joi.array().min(4).max(8).items(intRating).required() })
37-
.when('q3', {is: '11-50', then: Joi.array().min(8).max(40).items(intRating).required() })
38-
.when('q3', {is: '50+', then: Joi.array().min(40).items(intRating).required().required() }),
35+
.when('q3', { is: '1-5', then: Joi.array().min(1).max(4).items(intRating).required() })
36+
.when('q3', { is: '6-10', then: Joi.array().min(4).max(8).items(intRating).required() })
37+
.when('q3', { is: '11-50', then: Joi.array().min(8).max(40).items(intRating).required() })
38+
.when('q3', { is: '50+', then: Joi.array().min(40).items(intRating).required().required() }),
3939
// Rate the reputation of Parisians in general, 1-5 rating
4040
q6: intRating.required()
4141
});
4242

4343
const response = {
44-
q1: true,
45-
q2: true,
46-
q3: '1-5',
47-
q4: [5],
48-
q5: [1],
49-
q6: 2
44+
q1: true,
45+
q2: true,
46+
q3: '1-5',
47+
q4: [5],
48+
q5: [1],
49+
q6: 2
5050
};
5151

5252
Joi.assert(response, schema);

‎examples/multipleWhen.js‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const internals = {};
1313
const schema = {
1414
type: Joi.string().required(),
1515
subtype: Joi.alternatives()
16-
.when('type', {is: 'video', then: Joi.valid('mp4', 'wav')})
17-
.when('type', {is: 'audio', then: Joi.valid('mp3')})
18-
.when('type', {is: 'image', then: Joi.valid('jpg', 'png')})
19-
.when('type', {is: 'pdf' , then: Joi.valid('document')})
16+
.when('type', { is: 'video', then: Joi.valid('mp4', 'wav') })
17+
.when('type', { is: 'audio', then: Joi.valid('mp3') })
18+
.when('type', { is: 'image', then: Joi.valid('jpg', 'png') })
19+
.when('type', { is: 'pdf', then: Joi.valid('document') })
2020
};
2121

2222

‎examples/timestamps.js‎

100644100755
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ const javascriptTimestamp = now.getTime();
88
const unixTimestamp = now.getTime() / 1000;
99

1010
const schema = Joi.object().options({ abortEarly: false }).keys({
11-
javascript1: Joi.date().timestamp(),
12-
javascript2: Joi.date().timestamp('javascript'),
13-
unix: Joi.date().timestamp('unix')
11+
javascript1: Joi.date().timestamp(),
12+
javascript2: Joi.date().timestamp('javascript'),
13+
unix: Joi.date().timestamp('unix')
1414
});
1515

1616
const data = {
17-
javascript1: javascriptTimestamp,
18-
javascript2: javascriptTimestamp,
19-
unix: unixTimestamp
17+
javascript1: javascriptTimestamp,
18+
javascript2: javascriptTimestamp,
19+
unix: unixTimestamp
2020
};
2121

2222
Joi.assert(data, schema);

‎lib/types/any/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const Hoek = require('@hapi/hoek');
4-
const Marker = require('@hapi/marker');
54

65
const Cast = require('../../cast');
76
const Settings = require('./settings');
@@ -18,7 +17,7 @@ let Schemas = null;
1817

1918
const internals = {
2019
Set: require('../../set'),
21-
symbol: Marker('joi-any-base')
20+
symbol: Symbol.for('@hapi/joi/schema')
2221
};
2322

2423

‎lib/types/array/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22

3+
const Bourne = require('@hapi/bourne');
34
const Hoek = require('@hapi/hoek');
45

56
const Any = require('../any');
@@ -49,7 +50,7 @@ internals.Array = class extends Any {
4950
(value[0] === '[' || /^\s*\[/.test(value))) {
5051

5152
try {
52-
result.value = JSON.parse(value);
53+
result.value = Bourne.parse(value);
5354
}
5455
catch (e) { }
5556
}

‎lib/types/object/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22

3+
const Bourne = require('@hapi/bourne');
34
const Hoek = require('@hapi/hoek');
45
const Topo = require('@hapi/topo');
56

@@ -48,7 +49,7 @@ internals.Object = class extends Any {
4849
(value[0] === '{' || /^\s*\{/.test(value))) {
4950

5051
try {
51-
value = JSON.parse(value);
52+
value = Bourne.parse(value);
5253
}
5354
catch (e) { }
5455
}

‎package.json‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,17 @@
1111
],
1212
"dependencies": {
1313
"@hapi/address": "2.x.x",
14-
"@hapi/hoek": "6.x.x",
15-
"@hapi/marker": "1.x.x",
14+
"@hapi/bourne": "1.x.x",
15+
"@hapi/hoek": "8.x.x",
1616
"@hapi/topo": "3.x.x"
1717
},
1818
"devDependencies": {
19-
"@hapi/code": "5.x.x",
20-
"@hapi/lab": "18.x.x",
21-
"hapitoc": "1.x.x"
19+
"@hapi/code": "6.x.x",
20+
"@hapi/lab": "20.x.x"
2221
},
2322
"scripts": {
2423
"test": "lab -t 100 -a @hapi/code -L",
25-
"test-cov-html": "lab -r html -o coverage.html -a @hapi/code",
26-
"toc": "hapitoc && node docs/check-errors-list.js",
27-
"version": "npm run toc && git add API.md README.md"
24+
"test-cov-html": "lab -r html -o coverage.html -a @hapi/code"
2825
},
2926
"license": "BSD-3-Clause"
3027
}

0 commit comments

Comments
 (0)