@contember/engine-content-api 1.1.0-rc.1 → 1.2.0-alpha.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.
Files changed (50) hide show
  1. package/dist/src/acl/VariableInjector.d.ts.map +1 -1
  2. package/dist/src/acl/VariableInjector.js +9 -7
  3. package/dist/src/acl/VariableInjector.js.map +1 -1
  4. package/dist/src/acl/VariableUtils.d.ts.map +1 -1
  5. package/dist/src/acl/VariableUtils.js +18 -12
  6. package/dist/src/acl/VariableUtils.js.map +1 -1
  7. package/dist/src/input-validation/preValidation/InputPreValidator.js +1 -1
  8. package/dist/src/input-validation/preValidation/InputPreValidator.js.map +1 -1
  9. package/dist/src/mapper/select/ConditionBuilder.d.ts.map +1 -1
  10. package/dist/src/mapper/select/ConditionBuilder.js +5 -4
  11. package/dist/src/mapper/select/ConditionBuilder.js.map +1 -1
  12. package/dist/src/tsconfig.tsbuildinfo +1 -1
  13. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js +6 -1
  14. package/dist/tests/cases/integration/graphQlRequests/delete/aclDelete.test.js.map +1 -1
  15. package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js +12 -2
  16. package/dist/tests/cases/integration/graphQlRequests/insert/acl/setField.test.js.map +1 -1
  17. package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js +6 -1
  18. package/dist/tests/cases/integration/graphQlRequests/insert/aclInsert.test.js.map +1 -1
  19. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js +24 -4
  20. package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map +1 -1
  21. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js +6 -1
  22. package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map +1 -1
  23. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js +24 -4
  24. package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js.map +1 -1
  25. package/dist/tests/cases/unit/aclVariablesFactory.test.js +8 -6
  26. package/dist/tests/cases/unit/aclVariablesFactory.test.js.map +1 -1
  27. package/dist/tests/cases/unit/predicatesInjector.test.js +12 -6
  28. package/dist/tests/cases/unit/predicatesInjector.test.js.map +1 -1
  29. package/dist/tests/cases/unit/variableInjector.test.js +15 -3
  30. package/dist/tests/cases/unit/variableInjector.test.js.map +1 -1
  31. package/dist/tests/src/testGraphql.d.ts.map +1 -1
  32. package/dist/tests/src/testGraphql.js +4 -1
  33. package/dist/tests/src/testGraphql.js.map +1 -1
  34. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  35. package/package.json +10 -10
  36. package/src/acl/VariableInjector.ts +10 -8
  37. package/src/acl/VariableUtils.ts +18 -13
  38. package/src/input-validation/preValidation/InputPreValidator.ts +2 -2
  39. package/src/mapper/select/ConditionBuilder.ts +7 -4
  40. package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts +7 -2
  41. package/tests/cases/integration/graphQlRequests/insert/acl/setField.test.ts +13 -3
  42. package/tests/cases/integration/graphQlRequests/insert/aclInsert.test.ts +7 -2
  43. package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts +24 -4
  44. package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts +6 -1
  45. package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts +25 -5
  46. package/tests/cases/unit/aclVariablesFactory.test.ts +8 -6
  47. package/tests/cases/unit/predicatesInjector.test.ts +12 -6
  48. package/tests/cases/unit/variableInjector.test.ts +17 -5
  49. package/tests/src/testGraphql.ts +3 -1
  50. package/jasmine.json +0 -7
package/dist/src/acl/VariableInjector.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;IAmBhF,OAAO,CAAC,eAAe;CAYvB"}
1
+ {"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;IAmBhF,OAAO,CAAC,eAAe;CAcvB"}
package/dist/src/acl/VariableInjector.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.VariableInjector = void 0;
4
+ const schema_1 = require("@contember/schema");
4
5
  const schema_utils_1 = require("@contember/schema-utils");
5
6
  class VariableInjector {
6
7
  constructor(schema, variables) {
@@ -25,16 +26,17 @@ class VariableInjector {
25
26
  });
26
27
  }
27
28
  createCondition(variable) {
28
- if (variable === undefined) {
29
+ if (variable === undefined || variable.value.length === 0) {
29
30
  return { never: true };
30
31
  }
31
- if (Array.isArray(variable)) {
32
- return { in: variable };
32
+ const { value, definition } = variable;
33
+ if (definition.type === schema_1.Acl.VariableType.condition) {
34
+ if (value.length === 1) {
35
+ return value[0];
36
+ }
37
+ return { or: value };
33
38
  }
34
- if (typeof variable === 'string' || typeof variable === 'number') {
35
- return { eq: variable };
36
- }
37
- throw new Error('not implemented');
39
+ return { in: value };
38
40
  }
39
41
  }
40
42
  exports.VariableInjector = VariableInjector;
package/dist/src/acl/VariableInjector.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AACA,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;iBAC/D;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAA;iBAC3F;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,QAAuC;QAC9D,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;SACtB;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;SACvB;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACjE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;SACvB;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;IACnC,CAAC;CACD;AAlCD,4CAkCC"}
1
+ {"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;iBAC/D;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAA;iBAC3F;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,QAA0C;QACjE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;SACtB;QAED,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAA;QACtC,IAAI,UAAU,CAAC,IAAI,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS,EAAE;YACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,KAAK,CAAC,CAAC,CAAoB,CAAA;aAClC;YACD,OAAO,EAAE,EAAE,EAAE,KAA0B,EAAE,CAAA;SACzC;QACD,OAAO,EAAE,EAAE,EAAE,KAA4B,EAAE,CAAA;IAC5C,CAAC;CACD;AApCD,4CAoCC"}
package/dist/src/acl/VariableUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,aAAK,WAAW,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,EAAE,CAAA;AAEjH,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,YACX;IACT,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;CACxB,KACC,IAAI,YA0BN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}
1
+ {"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,aAAK,WAAW,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,EAAE,CAAA;AAEjH,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,YACX;IACT,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;CACxB,KACC,IAAI,YA+BN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}
package/dist/src/acl/VariableUtils.js CHANGED
@@ -8,19 +8,25 @@ const createAclVariables = (aclSchema, identity) => {
8
8
  const roleVariables = (0, schema_utils_1.getRoleVariables)(membership.role, aclSchema);
9
9
  const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.values]));
10
10
  return Object.entries(roleVariables).map(([name, def]) => {
11
- var _a;
12
11
  const prefixed = (0, exports.prefixVariable)(membership.role, name);
13
- switch (def.type) {
14
- case schema_1.Acl.VariableType.entity:
15
- return [prefixed, (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : []];
16
- case schema_1.Acl.VariableType.predefined:
17
- switch (def.value) {
18
- case 'identityID':
19
- return [prefixed, [identity.identityId]];
20
- case 'personID':
21
- return [prefixed, identity.personId ? [identity.personId] : []];
22
- }
23
- }
12
+ const value = (() => {
13
+ var _a, _b;
14
+ switch (def.type) {
15
+ case schema_1.Acl.VariableType.entity:
16
+ return (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : [];
17
+ case schema_1.Acl.VariableType.predefined:
18
+ switch (def.value) {
19
+ case 'identityID':
20
+ return [identity.identityId];
21
+ case 'personID':
22
+ return identity.personId ? [identity.personId] : [];
23
+ }
24
+ throw new Error(`Unknown predefined variable ${def.value}`);
25
+ case schema_1.Acl.VariableType.condition:
26
+ return ((_b = membershipVariablesMap[name]) !== null && _b !== void 0 ? _b : []).map(it => JSON.parse(it));
27
+ }
28
+ })();
29
+ return [prefixed, { value: value, definition: def }];
24
30
  });
25
31
  });
26
32
  return Object.fromEntries(variablesEntries);
package/dist/src/acl/VariableUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,0DAA0D;AAInD,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,QAIC,EACkB,EAAE;IAErB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CACpD,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvG,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;;YACxD,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAEtD,QAAQ,GAAG,CAAC,IAAI,EAAE;gBACjB,KAAK,YAAG,CAAC,YAAY,CAAC,MAAM;oBAC3B,OAAO,CAAC,QAAQ,EAAE,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAA;gBACtD,KAAK,YAAG,CAAC,YAAY,CAAC,UAAU;oBAC/B,QAAQ,GAAG,CAAC,KAAK,EAAE;wBAClB,KAAK,YAAY;4BAChB,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;wBACzC,KAAK,UAAU;4BACd,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;qBAChE;aACF;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAjCY,QAAA,kBAAkB,sBAiC9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}
1
+ {"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,0DAA0D;AAInD,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,QAIC,EACkB,EAAE;IAErB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CACpD,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvG,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAkC,EAAE;YACxF,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;;gBACnB,QAAQ,GAAG,CAAC,IAAI,EAAE;oBACjB,KAAK,YAAG,CAAC,YAAY,CAAC,MAAM;wBAC3B,OAAO,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAA;oBAC1C,KAAK,YAAG,CAAC,YAAY,CAAC,UAAU;wBAC/B,QAAQ,GAAG,CAAC,KAAK,EAAE;4BAClB,KAAK,YAAY;gCAChB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;4BAC7B,KAAK,UAAU;gCACd,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;yBACpD;wBACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;oBAC5D,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS;wBAC9B,OAAO,CAAC,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;iBACtE;YACF,CAAC,CAAC,EAAE,CAAA;YACJ,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}
package/dist/src/input-validation/preValidation/InputPreValidator.js CHANGED
@@ -69,7 +69,7 @@ class InputPreValidator {
69
69
  },
70
70
  visitHasOne: (entity, relation) => {
71
71
  const value = data[relation.name];
72
- if (value === undefined) {
72
+ if (value === undefined || value === null) {
73
73
  return undefined;
74
74
  }
75
75
  if ('disconnect' in value) {
package/dist/src/input-validation/preValidation/InputPreValidator.js.map CHANGED
@@ -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":";;;AAAA,0DAAiE;AACjE,uCAAyC;AACzC,8CAAmE;AACnE,oEAA8D;AAC9D,2DAA8E;AAC9E,2FAAuF;AACvF,4DAAwD;AACxD,kEAA4D;AAI5D,2FAAuF;AAGvF,kDAAmE;AACnE,kDAAkD;AAClD,8CAAiD;AAmBjD,MAAa,iBAAiB;IAC7B,YACkB,KAAmB,EACnB,mBAAwC,EACxC,mBAAwC,EACxC,YAAoC;QAHpC,UAAK,GAAL,KAAK,CAAc;QACnB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAwB;IACnD,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAwB;QACtF,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAElE,MAAM,gBAAgB,GAAG,YAAY;YACpC,CAAC,CAAC;gBACD,GAAG,IAAI;gBACP,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;aACjC;YACH,CAAC,CAAC,IAAI,CAAA;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;QAErE,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAE9D,MAAM,SAAS,GAAG,IAAI,qEAAiC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAC3E,MAAM,OAAO,GAAG,IAAI,oCAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACnE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAEpE,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,cAAc,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAwB;QAC/E,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAA;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;QAElD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QAC5F,MAAM,YAAY,GAAqB,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAEhF,MAAM,SAAS,GAAG,IAAI,qEAAiC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAC3E,MAAM,OAAO,GAAG,IAAI,oCAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACnE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAEpE,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,cAAc,CAAC,CAAA;IAC5C,CAAC;IAEO,sBAAsB,CAAC,MAAoB,EAAE,IAA2B;QAC/E,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;YAC5D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAkC,CAAA;gBAChE,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC5G,OAAO,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAA;YAC9D,CAAC;YACD,WAAW,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAA6C,CAAA;gBAC7E,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;YAC3B,CAAC;YACD,gFAAgF;YAChF,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;SACxB,CAAC,CAAA;QAEF,OAAO,qCAAiB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACrD,CAAC;IACO,KAAK,CAAC,sBAAsB,CACnC,MAAc,EACd,MAAoB,EACpB,KAAwB,EACxB,IAA2B,EAC3B,YAA0B;QAE1B,MAAM,aAAa,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE;YACjE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAkC,CAAA;YAC1D,CAAC;YACD,WAAW,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAmF,CAAA;gBACnH,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;oBAC1C,OAAO,SAAS,CAAA;iBAChB;gBACD,IAAI,YAAY,IAAI,KAAK,EAAE;oBAC1B,OAAO,IAAI,CAAA;iBACX;gBACD,IAAI,QAAQ,IAAI,KAAK,EAAE;oBACtB,IACC,IAAA,YAAI,EAA8B,QAAQ,EAAE,eAAe,CAAC;wBAC5D,QAAQ,CAAC,aAAa,CAAC,QAAQ,KAAK,cAAK,CAAC,QAAQ,CAAC,OAAO,EACzD;wBACD,OAAO,IAAI,CAAA;qBACX;oBACD,OAAO,IAAI,CAAA;iBACX;gBACD,OAAO,IAAI,CAAA;YACZ,CAAC;YACD,gFAAgF;YAChF,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;SACxB,CAAC,CAAA;QAEF,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,CAAA;QACnG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YAChC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/C,MAAM,IAAI,8BAAiB,EAAE,CAAA;aAC7B;QACF,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAC5C,MAAM,EACN,MAAM,EACN,KAAK,EACL,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CACzE,CAAA;QAED,OAAO,qCAAiB,CAAC,iBAAiB,CAAC,EAAE,GAAI,aAA8B,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;IACtG,CAAC;IAEO,cAAc,CAAC,KAA6B,EAAE,OAAsC,EAAE,IAAoB;QACjH,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAC5B,IAAA,aAAK,EACJ,KAAK,EACL,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,yCAAkB,EAAC,OAAO,EAAE,mCAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,KAAK,CAAC,CAC3G,CACD;aACA,MAAM,CAAC,CAAC,GAAG,EAA8C,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACrE,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAC3E,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC9B,MAAoB,EACpB,OAAuF;QAEvF,MAAM,uBAAuB,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEpF,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAChE,MAAM,CAAC,CAAC,KAAK,EAAgE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;aACpG,MAAM,CAAsD,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;aAC7F,MAAM,CAA0B,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACjG,CAAC;IAEO,kBAAkB,CAAC,aAAuB,EAAE,WAAmC;QACtF,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;aACzB,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE;YAC5B,OAAO,IAAA,aAAK,EACX,KAAK,EACL,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC5B,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAC1B,MAAM,CAAC,IAAI,CAAC,kCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAC7F,CACJ,CAAA;QACF,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CACnC,CAAA;IACF,CAAC;IAEO,iBAAiB,CAAC,KAA6B;QACtD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAEjG,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;aACzB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;aACjB,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,kCAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;aACpD,MAAM,CAAC,gBAAgB,CAAC;aACxB,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,+BAAgB,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;CACD;AAjKD,8CAiKC"}
package/dist/src/mapper/select/ConditionBuilder.d.ts.map CHANGED
@@ -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;CA8CtB"}
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"}
package/dist/src/mapper/select/ConditionBuilder.js CHANGED
@@ -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 keys = Object.keys(condition);
9
- if (keys.length === 0) {
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 (keys.length > 1) {
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[keys[0]](builder, condition[keys[0]]);
42
+ return handler[entries[0][0]](builder, entries[0][1]);
42
43
  }
43
44
  }
44
45
  exports.ConditionBuilder = ConditionBuilder;
package/dist/src/mapper/select/ConditionBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"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"}