@contember/engine-content-api 1.1.0-rc.2 → 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/dist/src/input-validation/EntityRulesResolver.js +3 -3
- package/dist/src/input-validation/EntityRulesResolver.js.map +1 -1
- package/dist/src/input-validation/preValidation/InputPreValidator.js +1 -1
- package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.js +5 -4
- package/dist/src/mapper/select/ConditionBuilder.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.d.ts +2 -0
- package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.d.ts.map +1 -0
- package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js +38 -0
- package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js.map +1 -0
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/input-validation/EntityRulesResolver.ts +3 -3
- package/src/input-validation/preValidation/InputPreValidator.ts +2 -2
- package/src/mapper/select/ConditionBuilder.ts +7 -4
- package/tests/cases/integration/graphQlDb/insert/insertSequence.test.ts +34 -0
|
@@ -37,7 +37,7 @@ class EntityRulesResolver {
|
|
|
37
37
|
}
|
|
38
38
|
getEntityRules(entityName) {
|
|
39
39
|
const definedRules = this.validationSchema[entityName] || {};
|
|
40
|
-
const fieldsNotNullFlag = (0, schema_utils_1.acceptEveryFieldVisitor)(this.model, entityName, new
|
|
40
|
+
const fieldsNotNullFlag = (0, schema_utils_1.acceptEveryFieldVisitor)(this.model, entityName, new RequiredFieldsVisitor());
|
|
41
41
|
const notNullFields = Object.keys((0, utils_1.filterObject)(fieldsNotNullFlag, (field, val) => val));
|
|
42
42
|
return notNullFields.reduce((entityRules, field) => ({
|
|
43
43
|
...entityRules,
|
|
@@ -49,9 +49,9 @@ class EntityRulesResolver {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
exports.EntityRulesResolver = EntityRulesResolver;
|
|
52
|
-
class
|
|
52
|
+
class RequiredFieldsVisitor {
|
|
53
53
|
visitColumn(entity, column) {
|
|
54
|
-
return !column.nullable;
|
|
54
|
+
return !column.nullable && typeof column.default === 'undefined' && !column.sequence;
|
|
55
55
|
}
|
|
56
56
|
visitManyHasManyInverse() {
|
|
57
57
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityRulesResolver.js","sourceRoot":"","sources":["../../../src/input-validation/EntityRulesResolver.ts"],"names":[],"mappings":";;;AAAA,oCAAkD;AAElD,0DAAqF;AACrF,oEAA8D;AAC9D,iDAAoD;AACpD,6CAAgD;AAEhD,MAAa,mBAAmB;IAC/B,YAA6B,gBAAmC,EAAmB,KAAmB;QAAzE,qBAAgB,GAAhB,gBAAgB,CAAmB;QAAmB,UAAK,GAAL,KAAK,CAAc;IAAG,CAAC;IAEnG,cAAc,CAAC,UAAkB;QACvC,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAClE,IAAA,iCAAkB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;gBACjD,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,YAAY,EAAE,GAAG,EAAE;oBAClB,MAAM,IAAI,8BAAiB,CAAC,0DAA0D,CAAC,CAAA;gBACxF,CAAC;aACD,CAAC,CAAA;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,YAAY,GAAG,kCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAChE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;oBAC5C,MAAM,UAAU,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE;wBAClE,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;wBACxB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI;qBACzB,CAAC,CAAA;oBACF,IAAI,UAAU,EAAE;wBACf,MAAM,IAAI,8BAAiB,CAAC,2DAA2D,CAAC,CAAA;qBACxF;iBACD;aACD;YACD,OAAO,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;IACH,CAAC;IAEM,cAAc,CAAC,UAAkB;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;QAC5D,MAAM,iBAAiB,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"EntityRulesResolver.js","sourceRoot":"","sources":["../../../src/input-validation/EntityRulesResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputPreValidator.js","sourceRoot":"","sources":["../../../../src/input-validation/preValidation/InputPreValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"InputPreValidator.js","sourceRoot":"","sources":["../../../../src/input-validation/preValidation/InputPreValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;CAiDtB"}
|
|
@@ -5,11 +5,12 @@ const database_1 = require("@contember/database");
|
|
|
5
5
|
const exception_1 = require("../../exception");
|
|
6
6
|
class ConditionBuilder {
|
|
7
7
|
build(builder, tableName, columnName, columnType, condition) {
|
|
8
|
-
const
|
|
9
|
-
|
|
8
|
+
const entries = Object.entries(condition)
|
|
9
|
+
.filter((it) => it[1] !== null);
|
|
10
|
+
if (entries.length === 0) {
|
|
10
11
|
return builder;
|
|
11
12
|
}
|
|
12
|
-
if (
|
|
13
|
+
if (entries.length > 1) {
|
|
13
14
|
throw new exception_1.UserError('Only single field is allowed. If you want to combine multiple conditions, use "and" or "or". Got: ' +
|
|
14
15
|
JSON.stringify(condition));
|
|
15
16
|
}
|
|
@@ -38,7 +39,7 @@ class ConditionBuilder {
|
|
|
38
39
|
// deprecated
|
|
39
40
|
null: (builder, value) => value ? builder.isNull(columnIdentifier) : builder.not(clause => clause.isNull(columnIdentifier)),
|
|
40
41
|
};
|
|
41
|
-
return handler[
|
|
42
|
+
return handler[entries[0][0]](builder, entries[0][1]);
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
exports.ConditionBuilder = ConditionBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":";;;AACA,kDAAqG;AACrG,+CAA2C;AAE3C,MAAa,gBAAgB;IACrB,KAAK,CACX,OAA4B,EAC5B,SAAiB,EACjB,UAAkB,EAClB,UAAkB,EAClB,SAA+B;QAE/B,MAAM,
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"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"}
|