@stamhoofd/structures 2.55.1 → 2.55.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.
|
@@ -18,7 +18,7 @@ function isEmptyFilter(filter) {
|
|
|
18
18
|
return false;
|
|
19
19
|
}
|
|
20
20
|
function mergeFilters(filters, type = '$and') {
|
|
21
|
-
const filteredFilters = filters.filter(f => !isEmptyFilter(f));
|
|
21
|
+
const filteredFilters = filters.filter(f => !isEmptyFilter(f)).flatMap(f => Array.isArray(f) ? (type === '$and' ? f : [{ $and: f }]) : [f]);
|
|
22
22
|
if (filteredFilters.length === 0) {
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../src/filters/StamhoofdFilter.ts"],"names":[],"mappings":";;AAqCA,sCAcC;AAED,oCAcC;AAED,gCAWC;AAED,sCAUC;AA5FD,+CAA4E;AAqC5E,SAAgB,aAAa,CAAC,MAAuB;IACjD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,YAAY,CAAC,OAAmC,EAAE,OAAuB,MAAM;IAC3F,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../src/filters/StamhoofdFilter.ts"],"names":[],"mappings":";;AAqCA,sCAcC;AAED,oCAcC;AAED,gCAWC;AAED,sCAUC;AA5FD,+CAA4E;AAqC5E,SAAgB,aAAa,CAAC,MAAuB;IACjD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,YAAY,CAAC,OAAmC,EAAE,OAAuB,MAAM;IAC3F,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5I,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO;QACH,CAAC,IAAI,CAAC,EAAE,eAAe;KAC1B,CAAC;AACN,CAAC;AAED,SAAgB,UAAU,CAAC,IAAc,EAAE,MAAsB;;IAC7D,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,SAAS;QACb,CAAC;QAED,qEAAqE;QACrE,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,MAAA,MAAA,CAAC,CAAC,KAAK,mCAAI,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,+BAAiB,CAAC,GAAG,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,aAAa,CAAC,CAAyB,EAAE,CAAyB;IAC9E,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -12,7 +12,7 @@ export function isEmptyFilter(filter) {
|
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
14
|
export function mergeFilters(filters, type = '$and') {
|
|
15
|
-
const filteredFilters = filters.filter(f => !isEmptyFilter(f));
|
|
15
|
+
const filteredFilters = filters.filter(f => !isEmptyFilter(f)).flatMap(f => Array.isArray(f) ? (type === '$and' ? f : [{ $and: f }]) : [f]);
|
|
16
16
|
if (filteredFilters.length === 0) {
|
|
17
17
|
return null;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../../src/filters/StamhoofdFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,iBAAiB,EAAY,MAAM,eAAe,CAAC;AAqC5E,MAAM,UAAU,aAAa,CAAC,MAAuB;IACjD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAmC,EAAE,OAAuB,MAAM;IAC3F,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"StamhoofdFilter.js","sourceRoot":"","sources":["../../../../src/filters/StamhoofdFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,iBAAiB,EAAY,MAAM,eAAe,CAAC;AAqC5E,MAAM,UAAU,aAAa,CAAC,MAAuB;IACjD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAmC,EAAE,OAAuB,MAAM;IAC3F,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5I,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO;QACH,CAAC,IAAI,CAAC,EAAE,eAAe;KAC1B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAc,EAAE,MAAsB;;IAC7D,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,SAAS;QACb,CAAC;QAED,qEAAqE;QACrE,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,MAAA,MAAA,CAAC,CAAC,KAAK,mCAAI,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,iBAAiB,CAAC,GAAG,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,CAAyB,EAAE,CAAyB;IAC9E,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/structures",
|
|
3
|
-
"version": "2.55.
|
|
3
|
+
"version": "2.55.2",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"module": "./esm/dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "05688607d81f5f9d7d01b425d3ffe87e583e47c9"
|
|
41
41
|
}
|