@royalschedule/validators 1.0.30 → 1.0.33
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/validators/course-events.js +2 -2
- package/build/validators/course-events.js.map +1 -1
- package/build/validators/courses.js +5 -0
- package/build/validators/courses.js.map +1 -1
- package/build/validators/locked-times.js +11 -0
- package/build/validators/locked-times.js.map +1 -1
- package/package.json +3 -3
|
@@ -36,8 +36,8 @@ exports.default = date_1.default.object({
|
|
|
36
36
|
.isSameDay(joi_1.default.ref('start'))
|
|
37
37
|
.greater(joi_1.default.ref('start'))
|
|
38
38
|
.minutesAfter(joi_1.default.ref('start'), joi_1.default.ref('duration')),
|
|
39
|
-
lockedTimes: joi_1.default.array().items(locked_times_1.default),
|
|
40
|
-
intervals: joi_1.default.array().items(intervals_1.default),
|
|
39
|
+
lockedTimes: joi_1.default.array().items(locked_times_1.default).allow(null),
|
|
40
|
+
intervals: joi_1.default.array().items(intervals_1.default).allow(null),
|
|
41
41
|
minBreakLength: break_length_1.default,
|
|
42
42
|
days: joi_1.default.array()
|
|
43
43
|
.allow(null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AAEjE,kEAAiE;AACjE,4DAA8D;AAC9D,kDAAyD;AACzD,kEAAiE;AAEjE,kBAAe,cAAQ,CAAC,MAAM,CAAC;IAC7B,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;IACpC,GAAG,EAAgB,cAAQ,CAAC,MAAM,EAAE;SACR,SAAS,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC3B,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB,YAAY,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,aAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE/E,WAAW,EAAO,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,11 @@ exports.default = joi_1.default.object({
|
|
|
20
20
|
id: joi_1.default.string()
|
|
21
21
|
})
|
|
22
22
|
],
|
|
23
|
+
eventDurationVariance: joi_1.default.number()
|
|
24
|
+
.allow(null)
|
|
25
|
+
.multiple(5)
|
|
26
|
+
.integer()
|
|
27
|
+
.min(0),
|
|
23
28
|
lockedTimes: joi_1.default.array().items(locked_times_1.default),
|
|
24
29
|
intervals: joi_1.default.array().items(intervals_1.default),
|
|
25
30
|
minBreakLength: break_length_1.default,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAEtD,kEAAiE;AACjE,4DAA8D;AAC9D,kDAAyD;AACzD,kEAAiE;
|
|
1
|
+
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAEtD,kEAAiE;AACjE,4DAA8D;AAC9D,kDAAyD;AACzD,kEAAiE;AAGjE,kBAAe,aAAG,CAAC,MAAM,CAAC;IACxB,EAAE,EAAuB,aAAG,CAAC,MAAM,EAAE;IAErC,WAAW,EAAc,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACrD,GAAG,EAAsB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IACjD,KAAK,EAAoB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,mDAAmD,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAC5H,OAAO,EAAkB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACrD,YAAY,EAAa;QACE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC5B,aAAG,CAAC,MAAM,CAAC;YACG,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE;SACjB,CAAC;KAEf;IAC1B,qBAAqB,EAAG,aAAG,CAAC,MAAM,EAAE;SACR,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,CAAC,CAAC,CAAC;SACX,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAClC,WAAW,EAAa,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;IACtD,SAAS,EAAe,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAS,CAAC;IACpD,cAAc,EAAU,sBAAY;IACpC,IAAI,EAAoB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAK,CAAC;IAEhD,MAAM,EAAkB,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CAAC,aAAG,CAAC,MAAM,CAAC;QACG,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;KAC1B,CAAC,CAAC;IACjD,QAAQ,EAAgB,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CAAC,aAAG,CAAC,MAAM,CAAC;QACG,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;KAC1B,CAAC,CAAC;IACjD,SAAS,EAAe,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CACJ,aAAG,CAAC,MAAM,CAAC;QACT,IAAI,EAAQ,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,SAAS,EAAG,aAAG,CAAC,KAAK,EAAE;aACP,KAAK,CAAC,aAAG,CAAC,MAAM,CAAC;YACE,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;SAC1B,CAAC,CAAC;KACrC,CAAC,CACH;CAC7B,CAAC,CAAC"}
|
|
@@ -5,12 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const joi_1 = __importDefault(require("joi"));
|
|
7
7
|
const date_1 = __importDefault(require("../common/date"));
|
|
8
|
+
const intervals_1 = __importDefault(require("./intervals"));
|
|
8
9
|
const collections = ['courses', 'locations', 'courseevents', 'groups', 'teachers'];
|
|
9
10
|
exports.default = date_1.default.object({
|
|
10
11
|
id: joi_1.default.string(),
|
|
11
12
|
displayName: joi_1.default.string().allow(null, ''),
|
|
12
13
|
start: date_1.default.isDate(),
|
|
13
14
|
end: date_1.default.isDate().greater(joi_1.default.ref('start')),
|
|
15
|
+
intervals: joi_1.default.array().items(intervals_1.default),
|
|
16
|
+
duration: joi_1.default.number()
|
|
17
|
+
.integer()
|
|
18
|
+
.multiple(5)
|
|
19
|
+
.min(5),
|
|
20
|
+
durationVariance: joi_1.default.number()
|
|
21
|
+
.integer()
|
|
22
|
+
.multiple(5)
|
|
23
|
+
.min(0),
|
|
24
|
+
type: joi_1.default.string(),
|
|
14
25
|
coalesced: joi_1.default.array()
|
|
15
26
|
.items(joi_1.default.object({
|
|
16
27
|
to: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locked-times.js","sourceRoot":"","sources":["../../src/validators/locked-times.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"locked-times.js","sourceRoot":"","sources":["../../src/validators/locked-times.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAEtD,0DAAiE;AACjE,4DAA8D;AAE9D,MAAM,WAAW,GAAa,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAE7F,kBAAe,cAAQ,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;IAEzB,WAAW,EAAO,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAC9C,KAAK,EAAa,cAAQ,CAAC,MAAM,EAAE;IACnC,GAAG,EAAe,cAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7D,SAAS,EAAS,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAS,CAAC;IAC9C,QAAQ,EAAU,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC5B,gBAAgB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAc,aAAG,CAAC,MAAM,EAAE;IAC9B,SAAS,EAAS,aAAG,CAAC,KAAK,EAAE;SACT,KAAK,CACJ,aAAG,CAAC,MAAM,CAAC;QACT,EAAE,EAAO;YACE,aAAG,CAAC,MAAM,EAAE;YACZ,aAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE,EAAE,CAAC;SACjC;QACV,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;KAC5C,CAAC,CACH;CACrB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@royalschedule/validators",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.33",
|
|
4
4
|
"description": "validators",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"ts-node": "^10.7.0",
|
|
22
|
-
"typescript": "^4.6.
|
|
22
|
+
"typescript": "^4.6.4"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@meanie/joi-moment": "^2.5.1",
|
|
26
26
|
"joi": "^17.6.0",
|
|
27
|
-
"moment": "^2.29.
|
|
27
|
+
"moment": "^2.29.3"
|
|
28
28
|
}
|
|
29
29
|
}
|