@royalschedule/validators 1.3.0 → 1.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/date.js +31 -1
- package/build/common/date.js.map +1 -1
- package/build/common/util.d.ts +5 -0
- package/build/common/util.js +9 -0
- package/build/common/util.js.map +1 -1
- package/build/validators/course-events.js +5 -1
- package/build/validators/course-events.js.map +1 -1
- package/build/validators/courses.js +1 -2
- package/build/validators/courses.js.map +1 -1
- package/build/validators/overlap-groups.js.map +1 -1
- package/package.json +1 -1
package/build/common/date.js
CHANGED
|
@@ -11,7 +11,8 @@ exports.default = joi_1.default.extend(joi => {
|
|
|
11
11
|
type: 'isDate',
|
|
12
12
|
base: joi.any(),
|
|
13
13
|
messages: {
|
|
14
|
-
'isDate.
|
|
14
|
+
'isDate.greater': '{{#label}} must be greater than value',
|
|
15
|
+
'isDate.less': '{{#label}} must be less than value',
|
|
15
16
|
'isDate.valid': '{{#label}} is not a valid date',
|
|
16
17
|
'isDate.null': '{{#label}} cannot be null',
|
|
17
18
|
'isDate.moment': '{{#label}} is not moment',
|
|
@@ -59,6 +60,35 @@ exports.default = joi_1.default.extend(joi => {
|
|
|
59
60
|
if (!_start.isValid())
|
|
60
61
|
return helpers.error('isDate.valid');
|
|
61
62
|
if (!_start.isBefore(value))
|
|
63
|
+
return helpers.error('isDate.greater');
|
|
64
|
+
}
|
|
65
|
+
return value;
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
less: {
|
|
69
|
+
multi: true,
|
|
70
|
+
method(end) {
|
|
71
|
+
return this.$_addRule({ name: 'less', args: { end } });
|
|
72
|
+
},
|
|
73
|
+
args: [
|
|
74
|
+
{
|
|
75
|
+
name: 'end',
|
|
76
|
+
ref: true,
|
|
77
|
+
assert: (value) => value === undefined ||
|
|
78
|
+
value instanceof Date ||
|
|
79
|
+
value instanceof moment_1.default ||
|
|
80
|
+
typeof value === 'string' ||
|
|
81
|
+
value instanceof String,
|
|
82
|
+
message: 'must be moment or Date'
|
|
83
|
+
}
|
|
84
|
+
],
|
|
85
|
+
validate(value, helpers, args, options) {
|
|
86
|
+
const { end } = args;
|
|
87
|
+
if (end) {
|
|
88
|
+
const _end = moment_1.default.utc(end);
|
|
89
|
+
if (!_end.isValid())
|
|
90
|
+
return helpers.error('isDate.valid');
|
|
91
|
+
if (!_end.isAfter(value))
|
|
62
92
|
return helpers.error('isDate.less');
|
|
63
93
|
}
|
|
64
94
|
return value;
|
package/build/common/date.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/common/date.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,oDAAyD;AACzD,oDAAyD;AAEzD,kBAAe,aAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;IAC9B,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE;QACf,QAAQ,EAAE;YACN,
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/common/date.ts"],"names":[],"mappings":"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"}
|
package/build/common/util.d.ts
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { CustomHelpers, ObjectSchema } from 'joi';
|
|
2
|
+
import moment from 'moment';
|
|
2
3
|
export declare namespace Util {
|
|
4
|
+
namespace Constants {
|
|
5
|
+
const FIRST_TIME: moment.Moment;
|
|
6
|
+
const LAST_TIME: moment.Moment;
|
|
7
|
+
}
|
|
3
8
|
namespace functions {
|
|
4
9
|
const schemaWrapper: <T extends object>(schema: {
|
|
5
10
|
default: ObjectSchema<T>;
|
package/build/common/util.js
CHANGED
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.Util = void 0;
|
|
7
|
+
const moment_1 = __importDefault(require("moment"));
|
|
4
8
|
var Util;
|
|
5
9
|
(function (Util) {
|
|
10
|
+
let Constants;
|
|
11
|
+
(function (Constants) {
|
|
12
|
+
Constants.FIRST_TIME = moment_1.default.utc('1970-01-05').startOf('day');
|
|
13
|
+
Constants.LAST_TIME = moment_1.default.utc('1970-01-05').add(7, 'd').endOf('day');
|
|
14
|
+
})(Constants = Util.Constants || (Util.Constants = {}));
|
|
6
15
|
let functions;
|
|
7
16
|
(function (functions) {
|
|
8
17
|
functions.schemaWrapper = function (schema) {
|
package/build/common/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.ts"],"names":[],"mappings":";;;;;;AAEA,oDAAyD;AAEzD,IAAiB,IAAI,CAoBpB;AApBD,WAAiB,IAAI;IACnB,IAAiB,SAAS,CAGzB;IAHD,WAAiB,SAAS;QACX,oBAAU,GAAG,gBAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACrD,mBAAS,GAAI,gBAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9E,CAAC,EAHgB,SAAS,GAAT,cAAS,KAAT,cAAS,QAGzB;IAED,IAAiB,SAAS,CAazB;IAbD,WAAiB,SAAS;QACX,uBAAa,GACtB,UAA6B,MAAoC;YACnE,OAAO,CAAC,GAAM,EAAE,OAAyB,EAAE,EAAE;gBAC3C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE9E,IAAI,KAAK,EAAE;oBACT,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBACrC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;QACJ,CAAC,CAAA;IACH,CAAC,EAbgB,SAAS,GAAT,cAAS,KAAT,cAAS,QAazB;AACH,CAAC,EApBgB,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAoBpB"}
|
|
@@ -37,8 +37,12 @@ exports.default = joi_1.default.object({
|
|
|
37
37
|
.integer()
|
|
38
38
|
.min(0),
|
|
39
39
|
fixedStart: joi_1.default.boolean(),
|
|
40
|
-
start: date_1.default.isDate()
|
|
40
|
+
start: date_1.default.isDate()
|
|
41
|
+
.greater(util_1.Util.Constants.FIRST_TIME)
|
|
42
|
+
.less(util_1.Util.Constants.LAST_TIME),
|
|
41
43
|
end: date_1.default.isDate()
|
|
44
|
+
.greater(util_1.Util.Constants.FIRST_TIME)
|
|
45
|
+
.less(util_1.Util.Constants.LAST_TIME)
|
|
42
46
|
.isSameDay(joi_1.default.ref('start'))
|
|
43
47
|
.greater(joi_1.default.ref('start'))
|
|
44
48
|
.minutesAfter(joi_1.default.ref('start'), joi_1.default.ref('duration')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AACjE,0DAAiE;AACjE,yCAAiE;AAGjE,4DAA8D;AAC9D,kDAAyD;AACzD,kEAAiE;AACjE,4DAA8D;AAC9D,sDAA2D;AAE3D,wDAA4D;AAC5D,wDAA4D;AAC5D,0DAA6D;AAE7D,kBAAe,aAAG,CAAC,MAAM,CAAsB;IAC7C,EAAE,EAAiB,aAAG,CAAC,MAAM,EAAE;IAE/B,WAAW,EAAQ,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAC/C,GAAG,EAAgB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAC3C,KAAK,EAAc,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,mDAAmD,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAEtH,OAAO,EAAY,aAAG,CAAC,OAAO,EAAE;IAChC,MAAM,EAAa,aAAG,CAAC,OAAO,EAAE;IAEhC,QAAQ,EAAW,aAAG,CAAC,MAAM,EAAE;SACR,QAAQ,CAAC,CAAC,CAAC;SACX,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC7B,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,CAAC,CAAC,CAAC;SACX,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC7B,gBAAgB,EAAG,aAAG,CAAC,MAAM,EAAE;SACR,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,CAAC,CAAC,CAAC;SACX,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC7B,UAAU,EAAS,aAAG,CAAC,OAAO,EAAE;IAChC,KAAK,EAAc,cAAQ,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const util_1 = require("../common/util");
|
|
|
9
9
|
const intervals_1 = __importDefault(require("./intervals"));
|
|
10
10
|
const days_1 = __importDefault(require("./days"));
|
|
11
11
|
const break_length_1 = __importDefault(require("./break-length"));
|
|
12
|
-
const locations_1 = __importDefault(require("./locations"));
|
|
13
12
|
const groups_1 = __importDefault(require("./groups"));
|
|
14
13
|
const persons_1 = __importDefault(require("./persons"));
|
|
15
14
|
const periods_1 = __importDefault(require("./periods"));
|
|
@@ -89,7 +88,7 @@ exports.default = joi_1.default.object({
|
|
|
89
88
|
rank: joi_1.default.number().integer().min(0),
|
|
90
89
|
groupIndex: joi_1.default.number().integer().min(0),
|
|
91
90
|
locations: joi_1.default.array()
|
|
92
|
-
.items(
|
|
91
|
+
.items(joi_1.default.custom(util_1.Util.functions.schemaWrapper(require('./locations'))), joi_1.default.string())
|
|
93
92
|
}))
|
|
94
93
|
});
|
|
95
94
|
//# sourceMappingURL=courses.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAItD,0DAAiE;AACjE,yCAAiE;
|
|
1
|
+
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlap-groups.js","sourceRoot":"","sources":["../../src/validators/overlap-groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"overlap-groups.js","sourceRoot":"","sources":["../../src/validators/overlap-groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,mCAAyD;AAGzD,yCAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAA+C;IACtE,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAA,eAAM,EAAC,CAAC,CAAC,CAAC;IAElD,GAAG,EAAU,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IACrC,SAAS,EAAI,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CACJ,aAAG,CAAC,MAAM,CAAC;QACT,EAAE,EAAE;YACF,aAAG,CAAC,MAAM,EAAE;YACZ,aAAG,CAAC,MAAM,CAAC,WAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;SAC/D;QACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;KACvC,CAAC,CACH;IACjB,OAAO,EAAM,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CACJ,aAAG,CAAC,MAAM,CAAC;QACT,EAAE,EAAE;YACF,aAAG,CAAC,MAAM,EAAE;YACZ,aAAG,CAAC,MAAM,CAAC,WAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACpE,aAAG,CAAC,MAAM,CAAC,WAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;SAC/D;QACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC;QACrD,EAAE,EAAO,aAAG,CAAC,MAAM,EAAE;KACtB,CAAC,CACH;CAClB,CAAC,CAAC"}
|