remult 0.22.7-exp.1 → 0.22.7

package/esm/src/data-api.js

@@ -23,7 +23,7 @@ export class DataApi {
     async httpPost(res, req, body, serializeContext) {
         const action = req?.get('__action');
         if (action?.startsWith(liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeContext, action.substring(liveQueryAction.length));
+            return this.liveQuery(res, req, body, serializeContext, action.substring(liveQueryAction.length));
         switch (action) {
             case 'get':
                 return this.getArray(res, req, body);

package/esm/src/filter/filter-interfaces.js

@@ -377,12 +377,15 @@ export function buildFilterFromRequestParameters(entity, filterInfo) {
     let val = filterInfo.get('OR');
     if (val) {
         const array = separateArrayFromInnerArray(val);
-        where.push({
-            $and: array.map((v) => ({
-                $or: v.map((x) => buildFilterFromRequestParameters(entity, {
-                    get: (key) => x[key],
-                })),
+        const or = array.map((v) => ({
+            $or: v.map((x) => buildFilterFromRequestParameters(entity, {
+                get: (key) => x[key],
             })),
+        }));
+        if (or.length == 1)
+            return or[0];
+        where.push({
+            $and: or,
         });
     }
     for (const key in entity.entityType) {
@@ -405,6 +408,8 @@ export function buildFilterFromRequestParameters(entity, filterInfo) {
             }
         }
     }
+    if (where.length == 1)
+        return where[0];
     return { $and: where };
     function separateArrayFromInnerArray(val) {
         if (!Array.isArray(val))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.7-exp.1",
+    "version": "0.22.7",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/src/data-api.js

@@ -30,7 +30,7 @@ var DataApi = /** @class */ (function () {
                     case 0:
                         action = req === null || req === void 0 ? void 0 : req.get('__action');
                         if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeContext, action.substring(rest_data_provider_1.liveQueryAction.length))];
+                            return [2 /*return*/, this.liveQuery(res, req, body, serializeContext, action.substring(rest_data_provider_1.liveQueryAction.length))];
                         _a = action;
                         switch (_a) {
                             case 'get': return [3 /*break*/, 1];

package/src/filter/filter-interfaces.js

@@ -497,14 +497,17 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
     var val = filterInfo.get('OR');
     if (val) {
         var array = separateArrayFromInnerArray(val);
+        var or = array.map(function (v) { return ({
+            $or: v.map(function (x) {
+                return buildFilterFromRequestParameters(entity, {
+                    get: function (key) { return x[key]; },
+                });
+            }),
+        }); });
+        if (or.length == 1)
+            return or[0];
         where.push({
-            $and: array.map(function (v) { return ({
-                $or: v.map(function (x) {
-                    return buildFilterFromRequestParameters(entity, {
-                        get: function (key) { return x[key]; },
-                    });
-                }),
-            }); }),
+            $and: or,
         });
     }
     var _loop_2 = function (key) {
@@ -531,6 +534,8 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
     for (var key in entity.entityType) {
         _loop_2(key);
     }
+    if (where.length == 1)
+        return where[0];
     return { $and: where };
     function separateArrayFromInnerArray(val) {
         var e_4, _a;