remult 0.22.7-exp.1 → 0.22.8-exp.0

package/esm/src/column.js

@@ -14,6 +14,8 @@ export class LookupColumn {
     repository;
     id;
     toJson() {
+        if (!this.storedItem)
+            return undefined;
         if (this.item === null)
             return null;
         return this.repository.toJson(this.item);

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/esm/src/remult3/RepositoryImplementation.js

@@ -874,7 +874,15 @@ export class rowHelperImplementation extends rowHelperBase {
     }
     metadata;
     getId() {
-        return this.info.idMetadata.getId(this.instance);
+        const getVal = (y) => {
+            let z = this.lookups.get(y.key);
+            if (z)
+                return z.id;
+            return this.instance[y.key];
+        };
+        if (this.metadata.idMetadata.field instanceof CompoundIdField)
+            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+        return getVal(this.metadata.idMetadata.field);
     }
     saveMoreOriginalData() {
         this.originalId = this.getId();
@@ -1513,6 +1521,9 @@ class EntityFullInfo {
     }
     idMetadata = {
         getId: (item) => {
+            const ref = getEntityRef(item, false);
+            if (ref)
+                return ref.getId();
             if (this.idMetadata.field instanceof CompoundIdField)
                 return this.idMetadata.field.getId(item);
             else

package/esm/src/remult3/remult3.d.ts

@@ -5,6 +5,7 @@ import type { FieldMetadata } from '../column-interfaces';
 import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
+import type { EntityBase } from './RepositoryImplementation';
 export interface EntityRef<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
@@ -153,7 +154,7 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof import('./RepositoryImplementation').EntityBase>;
+export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {

package/package.json

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

package/src/column.js

@@ -21,6 +21,8 @@ var LookupColumn = /** @class */ (function () {
         this.id = id;
     }
     LookupColumn.prototype.toJson = function () {
+        if (!this.storedItem)
+            return undefined;
         if (this.item === null)
             return null;
         return this.repository.toJson(this.item);

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;

package/src/remult3/RepositoryImplementation.js

@@ -1436,7 +1436,16 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.getId = function () {
-        return this.info.idMetadata.getId(this.instance);
+        var _this = this;
+        var getVal = function (y) {
+            var z = _this.lookups.get(y.key);
+            if (z)
+                return z.id;
+            return _this.instance[y.key];
+        };
+        if (this.metadata.idMetadata.field instanceof CompoundIdField_1.CompoundIdField)
+            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+        return getVal(this.metadata.idMetadata.field);
     };
     rowHelperImplementation.prototype.saveMoreOriginalData = function () {
         this.originalId = this.getId();
@@ -2413,6 +2422,9 @@ var EntityFullInfo = /** @class */ (function () {
         this.key = key;
         this.idMetadata = {
             getId: function (item) {
+                var ref = (0, getEntityRef_1.getEntityRef)(item, false);
+                if (ref)
+                    return ref.getId();
                 if (_this.idMetadata.field instanceof CompoundIdField_1.CompoundIdField)
                     return _this.idMetadata.field.getId(item);
                 else

package/src/remult3/remult3.d.ts

@@ -5,6 +5,7 @@ import type { FieldMetadata } from '../column-interfaces';
 import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
+import type { EntityBase } from './RepositoryImplementation';
 export interface EntityRef<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
@@ -153,7 +154,7 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof import('./RepositoryImplementation').EntityBase>;
+export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {