@royalschedule/validators 1.1.0 → 1.1.1
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 +10 -10
- package/build/common/date.js.map +1 -1
- package/build/common/time.js +8 -4
- package/build/common/time.js.map +1 -1
- package/build/index.d.ts +13 -13
- package/build/validators/course-events.d.ts +2 -1
- package/build/validators/course-events.js +1 -1
- package/build/validators/course-events.js.map +1 -1
- package/build/validators/courses.d.ts +1 -1
- package/build/validators/courses.js.map +1 -1
- package/build/validators/days.d.ts +1 -1
- package/build/validators/days.js.map +1 -1
- package/build/validators/division-settings.d.ts +2 -1
- package/build/validators/division-settings.js +2 -5
- package/build/validators/division-settings.js.map +1 -1
- package/build/validators/divisions.d.ts +2 -1
- package/build/validators/divisions.js +1 -1
- package/build/validators/divisions.js.map +1 -1
- package/build/validators/generations.d.ts +2 -1
- package/build/validators/generations.js +1 -1
- package/build/validators/generations.js.map +1 -1
- package/build/validators/groups.d.ts +1 -1
- package/build/validators/groups.js +4 -0
- package/build/validators/groups.js.map +1 -1
- package/build/validators/intervals.d.ts +2 -1
- package/build/validators/intervals.js +1 -1
- package/build/validators/intervals.js.map +1 -1
- package/build/validators/locations.d.ts +1 -1
- package/build/validators/locations.js.map +1 -1
- package/build/validators/locked-times.d.ts +2 -1
- package/build/validators/locked-times.js +2 -3
- package/build/validators/locked-times.js.map +1 -1
- package/build/validators/overlap-groups.d.ts +2 -1
- package/build/validators/overlap-groups.js +3 -4
- package/build/validators/overlap-groups.js.map +1 -1
- package/build/validators/persons.d.ts +1 -1
- package/build/validators/persons.js +6 -0
- package/build/validators/persons.js.map +1 -1
- package/build/validators/teachers.d.ts +1 -1
- package/build/validators/teachers.js.map +1 -1
- package/package.json +4 -1
package/build/common/date.js
CHANGED
|
@@ -5,7 +5,8 @@ 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 moment_1 = __importDefault(require("moment"));
|
|
8
|
-
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
exports.default = joi_1.default.extend(joi => {
|
|
9
10
|
return {
|
|
10
11
|
type: 'isDate',
|
|
11
12
|
base: joi.any(),
|
|
@@ -18,21 +19,20 @@ exports.default = joi_1.default.extend((joi) => {
|
|
|
18
19
|
'isDate.duration': '{{#label}} is not the correct amount of minutes after start',
|
|
19
20
|
},
|
|
20
21
|
validate(value, helpers) {
|
|
21
|
-
let _value = value;
|
|
22
|
-
;
|
|
23
22
|
if (value == null)
|
|
24
23
|
return { value, errors: helpers.error('isDate.null') };
|
|
25
24
|
if (value instanceof Date) {
|
|
26
|
-
|
|
25
|
+
value = moment_1.default.utc(value);
|
|
27
26
|
}
|
|
28
|
-
if (
|
|
29
|
-
|
|
30
|
-
if (!(
|
|
27
|
+
if (lodash_1.default.isString(value))
|
|
28
|
+
value = moment_1.default.utc(value);
|
|
29
|
+
if (!(value instanceof moment_1.default)) {
|
|
31
30
|
return { value, errors: helpers.error('isDate.moment') };
|
|
32
31
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
else {
|
|
33
|
+
if (!value.isValid())
|
|
34
|
+
return { value, errors: helpers.error('isDate.valid') };
|
|
35
|
+
}
|
|
36
36
|
},
|
|
37
37
|
rules: {
|
|
38
38
|
greater: {
|
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;AAEzD,kBAAe,aAAG,CAAC,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/common/date.ts"],"names":[],"mappings":"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"}
|
package/build/common/time.js
CHANGED
|
@@ -5,6 +5,7 @@ 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 moment_1 = __importDefault(require("moment"));
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
9
|
const regex = new RegExp('^([0-1]?[0-9]|2[0-3]):[0-5][0 | 5]$');
|
|
9
10
|
const ISO = new RegExp(/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/);
|
|
10
11
|
const computeDuration = (time) => {
|
|
@@ -13,27 +14,30 @@ const computeDuration = (time) => {
|
|
|
13
14
|
if (time instanceof Date) {
|
|
14
15
|
_time = moment_1.default.utc(time);
|
|
15
16
|
}
|
|
16
|
-
if (
|
|
17
|
+
if (lodash_1.default.isString(time))
|
|
17
18
|
_time = moment_1.default.utc(time, 'HH:mm');
|
|
18
|
-
if (
|
|
19
|
+
if (moment_1.default.isMoment(time)) {
|
|
19
20
|
_duration += time.hours() * 60 + time.minutes();
|
|
20
21
|
}
|
|
21
22
|
return _duration;
|
|
22
23
|
};
|
|
23
|
-
exports.default = joi_1.default.extend(
|
|
24
|
+
exports.default = joi_1.default.extend(joi => {
|
|
24
25
|
return {
|
|
25
26
|
type: 'isTime',
|
|
26
27
|
base: joi.any(),
|
|
27
28
|
messages: {
|
|
28
29
|
'isTime.less': '{{#label}} must be greater than value',
|
|
29
30
|
'isTime.valid': '{{#label}} is not a valid time',
|
|
31
|
+
'isTime.type': '{{#label}} is not a valid type',
|
|
30
32
|
'isTime.discretization': '{{#label}} id not a multiple of discretization(5 min)',
|
|
31
33
|
},
|
|
32
34
|
validate(value, helpers) {
|
|
33
35
|
let _value = value;
|
|
34
|
-
if (
|
|
36
|
+
if (moment_1.default.isMoment(value)) {
|
|
35
37
|
_value = value.format('HH:mm');
|
|
36
38
|
}
|
|
39
|
+
if (!lodash_1.default.isString(_value))
|
|
40
|
+
return { value, errors: helpers.error('isTime.type') };
|
|
37
41
|
if (!regex.test(_value) && !ISO.test(_value))
|
|
38
42
|
return { value, errors: helpers.error('isTime.valid') };
|
|
39
43
|
},
|
package/build/common/time.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/common/time.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,oDAAyD;AAEzD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAChE,MAAM,GAAG,GAAK,IAAI,MAAM,CAAC,0EAA0E,CAAC,CAAC;AAErG,MAAM,eAAe,GAAG,CAAC,IAAmC,EAAU,EAAE;IACtE,IAAI,SAAS,GAAW,CAAC,CAAC;IAC1B,IAAI,KAAwB,CAAC;IAE7B,IAAI,IAAI,YAAY,IAAI,EAAE;QACxB,KAAK,GAAG,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAC1B;IAED,IAAI,
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/common/time.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,oDAAyD;AACzD,oDAAyD;AAEzD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAChE,MAAM,GAAG,GAAK,IAAI,MAAM,CAAC,0EAA0E,CAAC,CAAC;AAErG,MAAM,eAAe,GAAG,CAAC,IAAmC,EAAU,EAAE;IACtE,IAAI,SAAS,GAAW,CAAC,CAAC;IAC1B,IAAI,KAAwB,CAAC;IAE7B,IAAI,IAAI,YAAY,IAAI,EAAE;QACxB,KAAK,GAAG,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAC1B;IAED,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,KAAK,GAAG,gBAAM,CAAC,GAAG,CAAC,IAAc,EAAE,OAAO,CAAC,CAAC;IAE9C,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;KACjD;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAA;AAED,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,aAAa,EAAY,uCAAuC;YAChE,cAAc,EAAW,gCAAgC;YACzD,aAAa,EAAY,gCAAgC;YACzD,uBAAuB,EAAE,uDAAuD;SACnF;QACD,QAAQ,CAAC,KAAc,EAAE,OAAY;YACnC,IAAI,MAAM,GAAY,KAAK,CAAC;YAE5B,IAAI,gBAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC1B,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAChC;YAED,IAAI,CAAE,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtB,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YAEzD,IAAI,CAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAC5D,CAAC;QACD,KAAK,EAAE;YACL,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,MAAM,CAAC,KAAK;oBACV,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBACD,IAAI,EAAE;oBACJ;wBACE,IAAI,EAAE,OAAO;wBACb,GAAG,EAAE,IAAI;wBACT,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;wBACxD,OAAO,EAAE,8BAA8B;qBACxC;iBACF;gBACD,QAAQ,CAAC,KAAoC,EAAE,OAAY,EAAE,IAAS,EAAE,OAAY;oBAClF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;oBACvB,IAAI,KAAK,EAAE;wBACT,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC;4BACjD,OAAO,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;qBACvC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;aACF;SACF;KACF,CAAA;AACH,CAAC,CAAC,CAAA"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
export declare class Validate {
|
|
2
2
|
static BreakLength: (import("joi").NumberSchema | import("joi").BooleanSchema | import("joi").ArraySchema)[];
|
|
3
|
-
static CourseEvent:
|
|
4
|
-
static Course: import("joi").ObjectSchema<
|
|
5
|
-
static Day: import("joi").ObjectSchema<
|
|
6
|
-
static Settings:
|
|
7
|
-
static Division:
|
|
8
|
-
static Generation: any
|
|
9
|
-
static Group: import("joi").ObjectSchema<
|
|
10
|
-
static Interval:
|
|
11
|
-
static Location: import("joi").ObjectSchema<
|
|
12
|
-
static LockedTime:
|
|
13
|
-
static OverlapGroup:
|
|
14
|
-
static Person: import("joi").ObjectSchema<
|
|
15
|
-
static Teacher: import("joi").ObjectSchema<
|
|
3
|
+
static CourseEvent: import("joi").ObjectSchema<import("@royalschedule/maps/dist/core/types/course-events").CourseEvent>;
|
|
4
|
+
static Course: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/courses").Course, "belongsTo">>;
|
|
5
|
+
static Day: import("joi").ObjectSchema<import("@royalschedule/maps/dist/core/types/days").Day>;
|
|
6
|
+
static Settings: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/division-settings").DivisionSettings, "belongsTo">>;
|
|
7
|
+
static Division: import("joi").ObjectSchema<import("@royalschedule/maps/dist/core/types/divisions").Division>;
|
|
8
|
+
static Generation: import("joi").ObjectSchema<any>;
|
|
9
|
+
static Group: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/groups").Group, "belongsTo">>;
|
|
10
|
+
static Interval: import("joi").ObjectSchema<import("@royalschedule/maps/dist/core/types/intervals").Interval>;
|
|
11
|
+
static Location: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/locations").Location, "belongsTo">>;
|
|
12
|
+
static LockedTime: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/locked-times").LockedTime, "belongsTo">>;
|
|
13
|
+
static OverlapGroup: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/overlap-groups").OverlapGroup, "belongsTo">>;
|
|
14
|
+
static Person: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/persons").Person, "belongsTo">>;
|
|
15
|
+
static Teacher: import("joi").ObjectSchema<Omit<import("@royalschedule/maps/dist/core/types/teachers").Teacher, "belongsTo">>;
|
|
16
16
|
}
|
|
@@ -10,7 +10,7 @@ const locked_times_1 = __importDefault(require("./locked-times"));
|
|
|
10
10
|
const intervals_1 = __importDefault(require("./intervals"));
|
|
11
11
|
const days_1 = __importDefault(require("./days"));
|
|
12
12
|
const break_length_1 = __importDefault(require("./break-length"));
|
|
13
|
-
exports.default =
|
|
13
|
+
exports.default = joi_1.default.object({
|
|
14
14
|
id: joi_1.default.string(),
|
|
15
15
|
displayName: joi_1.default.string().allow(null, ''),
|
|
16
16
|
ids: joi_1.default.string().allow(null),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AACjE,0DAAiE;AAEjE,kEAAiE;AACjE,4DAA8D;AAC9D,kDAAyD;AACzD,kEAAiE;AAEjE,kBAAe,
|
|
1
|
+
{"version":3,"file":"course-events.js","sourceRoot":"","sources":["../../src/validators/course-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"courses.js","sourceRoot":"","sources":["../../src/validators/courses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"days.js","sourceRoot":"","sources":["../../src/validators/days.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"days.js","sourceRoot":"","sources":["../../src/validators/days.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,kBAAe,aAAG,CAAC,MAAM,CAAgB;IACvC,GAAG,EAAG,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC5B,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;CAC7B,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const joi_1 = __importDefault(require("joi"));
|
|
7
7
|
const time_1 = __importDefault(require("../common/time"));
|
|
8
8
|
const locked_times_1 = __importDefault(require("./locked-times"));
|
|
9
|
-
exports.default =
|
|
9
|
+
exports.default = joi_1.default.object({
|
|
10
10
|
id: joi_1.default.string(),
|
|
11
11
|
dayStart: time_1.default.isTime(),
|
|
12
12
|
dayEnd: time_1.default.isTime()
|
|
@@ -31,10 +31,6 @@ exports.default = time_1.default.object({
|
|
|
31
31
|
.integer()
|
|
32
32
|
.multiple(5)
|
|
33
33
|
.min(0),
|
|
34
|
-
defaultTeacherMinimumBreakLength: joi_1.default.number()
|
|
35
|
-
.integer()
|
|
36
|
-
.multiple(5)
|
|
37
|
-
.min(0),
|
|
38
34
|
defaultDependencyMinimumBreakLength: joi_1.default.number()
|
|
39
35
|
.integer()
|
|
40
36
|
.multiple(5)
|
|
@@ -70,5 +66,6 @@ exports.default = time_1.default.object({
|
|
|
70
66
|
.min(1),
|
|
71
67
|
defaultLunch: joi_1.default.array()
|
|
72
68
|
.items(locked_times_1.default),
|
|
69
|
+
requireForcedOverlappingEventsSets: joi_1.default.boolean(),
|
|
73
70
|
});
|
|
74
71
|
//# sourceMappingURL=division-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"division-settings.js","sourceRoot":"","sources":["../../src/validators/division-settings.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"division-settings.js","sourceRoot":"","sources":["../../src/validators/division-settings.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AAEjE,kEAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAAgD;IACvE,EAAE,EAAc,aAAG,CAAC,MAAM,EAAE;IAE5B,QAAQ,EAAQ,cAAQ,CAAC,MAAM,EAAE;IACjC,MAAM,EAAU,cAAQ,CAAC,MAAM,EAAE;SACR,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACrD,cAAc,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC1B,eAAe,EAAE,cAAQ,CAAC,MAAM,EAAE;IAClC,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACnB,yBAAyB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,GAAG,CAAC;IACvC,8BAA8B,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,EAAE,CAAC;IAC3C,8BAA8B,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC1C,mCAAmC,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC/C,8BAA8B,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC1C,4BAA4B,EAAI,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC1C,cAAc,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC1B,qBAAqB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACjC,gBAAgB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC5B,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC/B,kBAAkB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC9B,kBAAkB,EAAE,aAAG,CAAC,MAAM,EAAE;SACP,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC/B,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC/B,YAAY,EAAS,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CAAC,sBAAW,CAAC;IAE3C,kCAAkC,EAAE,aAAG,CAAC,OAAO,EAAE;CAClD,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ 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
|
-
exports.default =
|
|
8
|
+
exports.default = joi_1.default.object({
|
|
9
9
|
id: joi_1.default.string(),
|
|
10
10
|
displayName: joi_1.default.string(),
|
|
11
11
|
start: date_1.default.isDate(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"divisions.js","sourceRoot":"","sources":["../../src/validators/divisions.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"divisions.js","sourceRoot":"","sources":["../../src/validators/divisions.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAAqB;IAC5C,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;IAEzB,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IAEzB,KAAK,EAAQ,cAAQ,CAAC,MAAM,EAAE;IAC9B,GAAG,EAAU,cAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CACzD,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ 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
|
-
exports.default =
|
|
8
|
+
exports.default = joi_1.default.object({
|
|
9
9
|
id: joi_1.default.string(),
|
|
10
10
|
completionDate: date_1.default.isDate(),
|
|
11
11
|
startDate: date_1.default.isDate(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generations.js","sourceRoot":"","sources":["../../src/validators/generations.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"generations.js","sourceRoot":"","sources":["../../src/validators/generations.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAEtD,0DAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAAC;IACxB,EAAE,EAAe,aAAG,CAAC,MAAM,EAAE;IAE7B,cAAc,EAAG,cAAQ,CAAC,MAAM,EAAE;IAClC,SAAS,EAAQ,cAAQ,CAAC,MAAM,EAAE;IAElC,cAAc,EAAG,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,QAAQ,CAAC,CAAC,CAAC;SACX,GAAG,CAAC,CAAC,CAAC;IAC3B,eAAe,EAAE,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAW,aAAG,CAAC,MAAM,EAAE;SACR,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACpC,QAAQ,EAAS,aAAG,CAAC,MAAM,EAAE;SACR,GAAG,CAAC,GAAG,CAAC;IAC7B,QAAQ,EAAS,aAAG,CAAC,OAAO,EAAE;CAC/B,CAAC,CAAC"}
|
|
@@ -17,6 +17,10 @@ exports.default = joi_1.default.object({
|
|
|
17
17
|
intervals: joi_1.default.array().items(intervals_1.default),
|
|
18
18
|
minBreakLength: break_length_1.default,
|
|
19
19
|
days: joi_1.default.array().items(days_1.default),
|
|
20
|
+
members: joi_1.default.array()
|
|
21
|
+
.items(joi_1.default.object({
|
|
22
|
+
id: joi_1.default.string()
|
|
23
|
+
}), joi_1.default.string()),
|
|
20
24
|
forbidOverlappingEvents: joi_1.default.boolean(),
|
|
21
25
|
disableDayLengthPunishment: joi_1.default.boolean(),
|
|
22
26
|
maxNumWorkingHours: joi_1.default.number()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../src/validators/groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../src/validators/groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,kEAAiE;AACjE,4DAA8D;AAC9D,kEAAiE;AACjE,kDAAyD;AAEzD,kBAAe,aAAG,CAAC,MAAM,CAA4C;IACnE,EAAE,EAA0B,aAAG,CAAC,MAAM,EAAE;IAExC,WAAW,EAAiB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACxD,GAAG,EAAyB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAEpD,WAAW,EAAiB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;IAC1D,KAAK,EAAuB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACtE,SAAS,EAAmB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAS,CAAC;IACxD,cAAc,EAAc,sBAAY;IACxC,IAAI,EAAwB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAK,CAAC;IACpD,OAAO,EAAqB,aAAG,CAAC,KAAK,EAAE;SACP,KAAK,CACG,aAAG,CAAC,MAAM,CAAC;QACC,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;KACxB,CAAC,EACd,aAAG,CAAC,MAAM,EAAE,CACd;IACtC,uBAAuB,EAAK,aAAG,CAAC,OAAO,EAAE;IACzC,0BAA0B,EAAE,aAAG,CAAC,OAAO,EAAE;IACzC,kBAAkB,EAAU,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACtC,uBAAuB,EAAI;QACG,aAAG,CAAC,MAAM,EAAE;aACR,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC;aACN,GAAG,CAAC,EAAE,CAAC;QACX,aAAG,CAAC,KAAK,EAAE;aACP,KAAK,CACJ,aAAG,CAAC,MAAM,EAAE;aACR,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC;aACN,GAAG,CAAC,EAAE,CAAC,CACZ;KACL;IAC7B,MAAM,EAAsB,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACtC,IAAI,EAAwB,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;CACvC,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ 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 time_1 = __importDefault(require("../common/time"));
|
|
8
|
-
exports.default =
|
|
8
|
+
exports.default = joi_1.default.object({
|
|
9
9
|
id: joi_1.default.string(),
|
|
10
10
|
start: time_1.default.isTime(),
|
|
11
11
|
end: time_1.default.isTime()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intervals.js","sourceRoot":"","sources":["../../src/validators/intervals.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"intervals.js","sourceRoot":"","sources":["../../src/validators/intervals.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,0DAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAAqB;IAC5C,EAAE,EAAW,aAAG,CAAC,MAAM,EAAE;IAEzB,KAAK,EAAQ,cAAQ,CAAC,MAAM,EAAE;IAC9B,GAAG,EAAU,cAAQ,CAAC,MAAM,EAAE;SACR,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;CAChD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locations.js","sourceRoot":"","sources":["../../src/validators/locations.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"locations.js","sourceRoot":"","sources":["../../src/validators/locations.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,kEAAiE;AAEjE,kEAAiE;AACjE,kDAAyD;AAEzD,kBAAe,aAAG,CAAC,MAAM,CAAwC;IAC/D,EAAE,EAAe,aAAG,CAAC,MAAM,EAAE;IAE7B,WAAW,EAAM,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IAC7C,GAAG,EAAc,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAEzC,WAAW,EAAM,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;IAC/C,cAAc,EAAG,sBAAY;IAC7B,IAAI,EAAa,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAK,CAAC;CAC1C,CAAC,CAAC"}
|
|
@@ -4,12 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const joi_1 = __importDefault(require("joi"));
|
|
7
|
-
const nanoid_1 = require("nanoid");
|
|
8
7
|
const date_1 = __importDefault(require("../common/date"));
|
|
9
8
|
const intervals_1 = __importDefault(require("./intervals"));
|
|
10
9
|
const collections = ['courses', 'locations', 'courseevents', 'events', 'groups', 'teachers'];
|
|
11
|
-
exports.default =
|
|
12
|
-
id: joi_1.default.string()
|
|
10
|
+
exports.default = joi_1.default.object({
|
|
11
|
+
id: joi_1.default.string(),
|
|
13
12
|
displayName: joi_1.default.string().allow(null, ''),
|
|
14
13
|
start: date_1.default.isDate(),
|
|
15
14
|
end: date_1.default.isDate().allow(null).greater(joi_1.default.ref('start')),
|
|
@@ -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;AAItD,0DAAiE;AACjE,4DAA8D;AAE9D,MAAM,WAAW,GAAa,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAEvG,kBAAe,aAAG,CAAC,MAAM,CAA0C;IACjE,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,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzE,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;SACN,KAAK,CAAC,IAAI,CAAC;IACjC,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"}
|
|
@@ -5,9 +5,8 @@ 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 nanoid_1 = require("nanoid");
|
|
8
|
-
const date_1 = __importDefault(require("../common/date"));
|
|
9
8
|
const courses_1 = __importDefault(require("./courses"));
|
|
10
|
-
exports.default =
|
|
9
|
+
exports.default = joi_1.default.object({
|
|
11
10
|
id: joi_1.default.string().default(() => (0, nanoid_1.nanoid)(8)),
|
|
12
11
|
ids: joi_1.default.string().allow(null),
|
|
13
12
|
coalesced: joi_1.default.array()
|
|
@@ -16,7 +15,7 @@ exports.default = date_1.default.object({
|
|
|
16
15
|
joi_1.default.string(),
|
|
17
16
|
courses_1.default
|
|
18
17
|
],
|
|
19
|
-
toModel: joi_1.default.string().valid('courses'
|
|
18
|
+
toModel: joi_1.default.string().valid('courses')
|
|
20
19
|
})),
|
|
21
20
|
species: joi_1.default.array()
|
|
22
21
|
.items(joi_1.default.object({
|
|
@@ -24,7 +23,7 @@ exports.default = date_1.default.object({
|
|
|
24
23
|
joi_1.default.string(),
|
|
25
24
|
courses_1.default
|
|
26
25
|
],
|
|
27
|
-
toModel: joi_1.default.string().valid('
|
|
26
|
+
toModel: joi_1.default.string().valid('courseevents', 'events'),
|
|
28
27
|
id: joi_1.default.string(),
|
|
29
28
|
}))
|
|
30
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlap-groups.js","sourceRoot":"","sources":["../../src/validators/overlap-groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,mCAAyD;
|
|
1
|
+
{"version":3,"file":"overlap-groups.js","sourceRoot":"","sources":["../../src/validators/overlap-groups.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AACtD,mCAAyD;AAKzD,wDAA4D;AAE5D,kBAAe,aAAG,CAAC,MAAM,CAA4C;IACnE,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,EAAO;YACE,aAAG,CAAC,MAAM,EAAE;YACZ,iBAAO;SACR;QACV,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,EAAO;YACE,aAAG,CAAC,MAAM,EAAE;YACZ,iBAAO;SACR;QACV,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC;QACrD,EAAE,EAAO,aAAG,CAAC,MAAM,EAAE;KACtB,CAAC,CACH;CAClB,CAAC,CAAC"}
|
|
@@ -11,5 +11,11 @@ exports.default = joi_1.default.object({
|
|
|
11
11
|
ids: joi_1.default.string().allow(null),
|
|
12
12
|
lockedTimes: joi_1.default.array().items(locked_times_1.default),
|
|
13
13
|
lunch: joi_1.default.array().items(locked_times_1.default).allow(null),
|
|
14
|
+
group: [
|
|
15
|
+
joi_1.default.string(),
|
|
16
|
+
joi_1.default.object({
|
|
17
|
+
id: joi_1.default.string()
|
|
18
|
+
})
|
|
19
|
+
]
|
|
14
20
|
});
|
|
15
21
|
//# sourceMappingURL=persons.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persons.js","sourceRoot":"","sources":["../../src/validators/persons.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"persons.js","sourceRoot":"","sources":["../../src/validators/persons.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,kEAAiE;AAEjE,kBAAe,aAAG,CAAC,MAAM,CAAsC;IAC7D,EAAE,EAA0B,aAAG,CAAC,MAAM,EAAE;IAExC,WAAW,EAAiB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACxD,GAAG,EAAyB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAEpD,WAAW,EAAiB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;IAC1D,KAAK,EAAuB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IAEtE,KAAK,EAAuB;QACE,aAAG,CAAC,MAAM,EAAE;QACZ,aAAG,CAAC,MAAM,CAAC;YACG,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE;SACjB,CAAC;KACf;CAC9B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teachers.js","sourceRoot":"","sources":["../../src/validators/teachers.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;
|
|
1
|
+
{"version":3,"file":"teachers.js","sourceRoot":"","sources":["../../src/validators/teachers.ts"],"names":[],"mappings":";;;;;AAAA,8CAAsD;AAGtD,kEAAiE;AACjE,4DAA8D;AAC9D,kEAAiE;AACjE,kDAAyD;AAEzD,kBAAe,aAAG,CAAC,MAAM,CAAuC;IAC9D,EAAE,EAA0B,aAAG,CAAC,MAAM,EAAE;IAExC,WAAW,EAAiB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;IACxD,GAAG,EAAyB,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAEpD,WAAW,EAAiB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC;IAC1D,KAAK,EAAuB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAW,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACtE,SAAS,EAAmB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,mBAAS,CAAC;IACxD,cAAc,EAAc,sBAAY;IACxC,IAAI,EAAwB,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,cAAK,CAAC;IAEpD,uBAAuB,EAAK,aAAG,CAAC,OAAO,EAAE;IACzC,0BAA0B,EAAE,aAAG,CAAC,OAAO,EAAE;IACzC,kBAAkB,EAAU,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACtC,uBAAuB,EAAI;QACG,aAAG,CAAC,MAAM,EAAE;aACR,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC;aACN,GAAG,CAAC,EAAE,CAAC;QACX,aAAG,CAAC,KAAK,EAAE;aACP,KAAK,CACJ,aAAG,CAAC,MAAM,EAAE;aACR,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC;aACN,GAAG,CAAC,EAAE,CAAC,CACZ;KACL;IAC7B,MAAM,EAAsB,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;IACtC,IAAI,EAAwB,aAAG,CAAC,MAAM,EAAE;SACR,OAAO,EAAE;SACT,GAAG,CAAC,CAAC,CAAC;CACvC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@royalschedule/validators",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"description": "validators",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -18,12 +18,15 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"devDependencies": {
|
|
21
|
+
"@types/lodash": "^4.14.185",
|
|
21
22
|
"ts-node": "^10.8.2",
|
|
22
23
|
"typescript": "^4.7.4"
|
|
23
24
|
},
|
|
24
25
|
"dependencies": {
|
|
25
26
|
"@meanie/joi-moment": "^2.5.1",
|
|
27
|
+
"@royalschedule/maps": "^2.2.81",
|
|
26
28
|
"joi": "^17.6.0",
|
|
29
|
+
"lodash": "^4.17.21",
|
|
27
30
|
"moment": "^2.29.4",
|
|
28
31
|
"nanoid": "^3.0.0"
|
|
29
32
|
}
|