integreat 0.8.0-beta.0 → 0.8.0-beta.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.
package/dist/index.js CHANGED
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "transformers", { enumerable: true, get: function
15
15
  var middleware_1 = require("./middleware");
16
16
  Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return middleware_1.default; } });
17
17
  exports.default = {
18
- version: '0.8.0-beta.0',
18
+ version: '0.8.0-beta.2',
19
19
  create: create_1.default,
20
20
  mergeDefinitions: mergeDefinitions_1.default,
21
21
  mergeResources: mergeResources_1.default,
@@ -63,7 +63,7 @@ exports.default = ({ transporters, auths, schemas, mapOptions = {}, middleware =
63
63
  throw new TypeError(`Can't create service without an id.`);
64
64
  }
65
65
  const transporter = (0, indexUtils_1.lookupById)(transporterId, transporters);
66
- mapOptions = { noneValues: [undefined, null], ...mapOptions };
66
+ mapOptions = { noneValues: [undefined, null, ''], ...mapOptions };
67
67
  const authorization = typeof auth === 'string' ? (0, indexUtils_1.lookupById)(auth, auths) : undefined;
68
68
  const requireAuth = !!auth;
69
69
  const authorizeDataFromService = authorizeData.fromService(schemas);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const map_transform_1 = require("map-transform");
4
+ const is_1 = require("./is");
5
+ function prepareFilter(path, filter) {
6
+ if (path === '$or') {
7
+ if ((0, is_1.isObject)(filter)) {
8
+ return validateFilters({ $or: true, ...filter });
9
+ }
10
+ }
11
+ else if (filter) {
12
+ return (0, map_transform_1.validate)(path, filter);
13
+ }
14
+ return undefined;
15
+ }
4
16
  function validateFilters(filters) {
5
17
  const filterFns = Object.entries(filters)
6
- .filter(([path]) => path !== '$or')
7
- .map(([path, filter]) => (filter ? (0, map_transform_1.validate)(path, filter) : undefined))
18
+ .map(([path, filter]) => prepareFilter(path, filter))
8
19
  .filter(Boolean);
9
20
  const isOrFilters = filters.$or === true;
10
21
  return function validate(data) {
@@ -1 +1 @@
1
- {"version":3,"file":"validateFilters.js","sourceRoot":"","sources":["../../src/utils/validateFilters.ts"],"names":[],"mappings":";;AAAA,iDAAwC;AAKxC,SAAwB,eAAe,CACrC,OAA+C;IAE/C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,wBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;SACtE,MAAM,CAAC,OAAO,CAAe,CAAA;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,KAAK,IAAI,CAAA;IAExC,OAAO,SAAS,QAAQ,CAAC,IAAa;QACpC,OAAO,WAAW;YAChB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/C,CAAC,CAAA;AACH,CAAC;AAdD,kCAcC"}
1
+ {"version":3,"file":"validateFilters.js","sourceRoot":"","sources":["../../src/utils/validateFilters.ts"],"names":[],"mappings":";;AAAA,iDAAwC;AAExC,6BAA+B;AAI/B,SAAS,aAAa,CAAC,IAAY,EAAE,MAAmB;IACtD,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,EAAE;YACpB,OAAO,eAAe,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;SACjD;KACF;SAAM,IAAI,MAAM,EAAE;QACjB,OAAO,IAAA,wBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAC9B;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAwB,eAAe,CACrC,OAA+C;IAE/C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACpD,MAAM,CAAC,OAAO,CAAe,CAAA;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,KAAK,IAAI,CAAA;IAExC,OAAO,SAAS,QAAQ,CAAC,IAAa;QACpC,OAAO,WAAW;YAChB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/C,CAAC,CAAA;AACH,CAAC;AAbD,kCAaC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "integreat",
3
- "version": "0.8.0-beta.0",
3
+ "version": "0.8.0-beta.2",
4
4
  "description": "Node.js integration layer",
5
5
  "author": "Kjell-Morten Bratsberg Thorsen <kjellmorten@integreat.io> (https://integreat.io/)",
6
6
  "license": "ISC",