@aneuhold/core-ts-db-lib 1.0.30 → 1.0.32
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/lib/embedded-types/dashboard/task/FilterSettings.d.ts.map +1 -1
- package/lib/embedded-types/dashboard/task/FilterSettings.js +2 -0
- package/lib/schemas/type-guards/commonTypeGuards.d.ts.map +1 -1
- package/lib/schemas/type-guards/commonTypeGuards.js +1 -1
- package/lib/schemas/validators/ValidateUtil.d.ts.map +1 -1
- package/lib/schemas/validators/ValidateUtil.js +2 -1
- package/lib/schemas/validators/ValidateUtil.spec.js +10 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,yCAAyC,CAAC;AAC1E,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,GACb,+BAA+B,CAQjC;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"FilterSettings.d.ts","sourceRoot":"","sources":["../../../../src/embedded-types/dashboard/task/FilterSettings.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,yCAAyC,CAAC;AAC1E,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,GACb,+BAA+B,CAQjC;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,mBAAmB,QA2C5B;AAED;;;GAGG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAClD,CAAC,QAAQ,EAAE,MAAM,GAAG,+BAA+B,CAAC;CACrD,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,CAAC,MAAM,EAAE,MAAM,GAAG,+BAA+B,CAAC;CACnD,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,qBAAqB,CAAC;IACjC,kBAAkB,EAAE,qBAAqB,CAAC;IAC1C,SAAS,EAAE;QACT,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF;;OAEG;IACH,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,CAAC;CACf,CAAC"}
|
|
@@ -20,6 +20,8 @@ function validateFilterSettings(validate, config) {
|
|
|
20
20
|
validate.string(`taskListFilterSettings.${category}.userId`, defaultSettings.userId);
|
|
21
21
|
validate.object(`taskListFilterSettings.${category}.completed`, defaultSettings.completed);
|
|
22
22
|
validate.boolean(`taskListFilterSettings.${category}.completed.show`, defaultSettings.completed.show);
|
|
23
|
+
validate.object(`taskListFilterSettings.${category}.grandChildrenTasks`, defaultSettings.grandChildrenTasks);
|
|
24
|
+
validate.boolean(`taskListFilterSettings.${category}.grandChildrenTasks.show`, defaultSettings.grandChildrenTasks.show);
|
|
23
25
|
validate.object(`taskListFilterSettings.${category}.startDate`, defaultSettings.startDate);
|
|
24
26
|
validate.boolean(`taskListFilterSettings.${category}.startDate.showFutureTasks`, defaultSettings.startDate.showFutureTasks);
|
|
25
27
|
validate.object(`taskListFilterSettings.${category}.tags`, defaultSettings.tags);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypeGuards.d.ts","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"commonTypeGuards.d.ts","sourceRoot":"","sources":["../../../src/schemas/type-guards/commonTypeGuards.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,GAAG,MAAM,CAI5E;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAE5C;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,SAAS,GAAG,MAAM,GAAG,IAAI,CAEpC;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,SAAS,GAAG,IAAI,GAAG,MAAM,CAEpC;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,SAAS,GAAG,IAAI,GAAG,OAAO,CAErC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isOptionalBoolean = exports.isOptionalNumber = exports.isOptionalString = exports.isOptionalArray = exports.isOptionalObject = void 0;
|
|
4
4
|
function isOptionalObject(value) {
|
|
5
|
-
return value === undefined || typeof value === 'object';
|
|
5
|
+
return (value === undefined || (typeof value === 'object' && !Array.isArray(value)));
|
|
6
6
|
}
|
|
7
7
|
exports.isOptionalObject = isOptionalObject;
|
|
8
8
|
function isOptionalArray(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateUtil.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"AAQA,KAAK,eAAe,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAKzB,OAAO,CAAC,WAAW;IAJrB,YAAY,EAAE,eAAe,CAAC;gBAG5B,YAAY,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAUjC,aAAa,CAAC,SAAS,EAAE,MAAM;IAU/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"ValidateUtil.d.ts","sourceRoot":"","sources":["../../../src/schemas/validators/ValidateUtil.ts"],"names":[],"mappings":"AAQA,KAAK,eAAe,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,QAAQ;IAKzB,OAAO,CAAC,WAAW;IAJrB,YAAY,EAAE,eAAe,CAAC;gBAG5B,YAAY,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE;IAK/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAUjC,aAAa,CAAC,SAAS,EAAE,MAAM;IAU/B,cAAc,CAAC,SAAS,EAAE,MAAM;IAUhC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAW9C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAU9C,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO;IAUhD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE;IAUhD;;;;;;;;;OASG;IACH,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,WAAW;CAWpB"}
|
|
@@ -65,7 +65,8 @@ class Validate {
|
|
|
65
65
|
}
|
|
66
66
|
object(fieldName, defaultValue) {
|
|
67
67
|
if (this.fieldPathIsValid(fieldName) &&
|
|
68
|
-
|
|
68
|
+
(Array.isArray(this.getField(fieldName)) ||
|
|
69
|
+
typeof this.getField(fieldName) !== 'object')) {
|
|
69
70
|
this.errorsArray.push(`${fieldName} must be an object`);
|
|
70
71
|
this.updateField(fieldName, defaultValue);
|
|
71
72
|
}
|
|
@@ -52,4 +52,14 @@ describe('Validate', () => {
|
|
|
52
52
|
validate.optionalArray('testField');
|
|
53
53
|
expect(errorsArray.length).toBe(0);
|
|
54
54
|
});
|
|
55
|
+
it('should validate required object', () => {
|
|
56
|
+
const validate = new ValidateUtil_1.default(parentObject, errorsArray);
|
|
57
|
+
parentObject.testField = [];
|
|
58
|
+
validate.object('testField', {});
|
|
59
|
+
expect(errorsArray).toContain('testField must be an object');
|
|
60
|
+
errorsArray = [];
|
|
61
|
+
parentObject.testField = {};
|
|
62
|
+
validate.object('testField', {});
|
|
63
|
+
expect(errorsArray.length).toBe(0);
|
|
64
|
+
});
|
|
55
65
|
});
|