remult 0.23.4 → 0.23.5

package/esm/src/data-api.d.ts

@@ -14,6 +14,7 @@ export declare class DataApi<T = any> {
         r: any[];
         findOptions: FindOptions<T>;
     }>;
+    private includeNone;
     getArray(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
     liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeContext: () => Promise<any>, queryChannel: string): Promise<void>;
     private buildWhere;

package/esm/src/data-api.js

@@ -1,3 +1,4 @@
+import { getRelationInfo } from '../internals';
 import { doTransaction } from './context';
 import { findOptionsToJson, liveQueryAction, } from './data-providers/rest-data-provider';
 import { Filter, buildFilterFromRequestParameters, customUrlToken, } from './filter/filter-interfaces';
@@ -60,7 +61,10 @@ export class DataApi {
         }
     }
     async getArrayImpl(response, request, filterBody) {
-        let findOptions = { load: () => [] };
+        let findOptions = {
+            load: () => [],
+            include: this.includeNone(),
+        };
         findOptions.where = await this.buildWhere(request, filterBody);
         if (request) {
             let sort = request.get('_sort');
@@ -111,6 +115,15 @@ export class DataApi {
         });
         return { r, findOptions };
     }
+    includeNone() {
+        let include = {};
+        for (const field of this.repository.metadata.fields) {
+            if (getRelationInfo(field.options)) {
+                include[field.key] = false;
+            }
+        }
+        return include;
+    }
     async getArray(response, request, filterBody) {
         if (!this.repository.metadata.apiReadAllowed) {
             response.forbidden();
@@ -191,6 +204,7 @@ export class DataApi {
             await this.repository
                 .find({
                 where: { $and: where },
+                include: this.includeNone(),
             })
                 .then(async (r) => {
                 if (r.length == 0)

package/esm/src/filter/filter-interfaces.d.ts

@@ -1,5 +1,5 @@
 import type { FieldMetadata } from '../column-interfaces';
-import type { Remult } from '../context';
+import { Remult } from '../context';
 import type { EntityFilter, EntityMetadata } from '../remult3/remult3';
 export declare class Filter {
     private apply;

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

@@ -1,3 +1,4 @@
+import { Remult } from '../context';
 import { getEntityRef, getEntitySettings } from '../remult3/getEntityRef';
 import { getRelationInfo } from '../remult3/relationInfoMember';
 export class Filter {
@@ -57,7 +58,7 @@ export class Filter {
                             : new filterHelper(field);
                         let found = false;
                         if (fieldToFilter !== undefined && fieldToFilter != null) {
-                            if (fieldToFilter.$id)
+                            if (fieldToFilter.$id !== undefined)
                                 fieldToFilter = fieldToFilter.$id;
                             for (const key in fieldToFilter) {
                                 if (Object.prototype.hasOwnProperty.call(fieldToFilter, key)) {
@@ -164,8 +165,18 @@ class filterHelper {
     processVal(val) {
         let ei = getEntitySettings(this.metadata.valueType, false);
         if (ei) {
-            if (!val)
+            if (!val) {
+                if (val === null && !this.metadata.allowNull) {
+                    const rel = getRelationInfo(this.metadata.options);
+                    if (rel?.type === 'reference')
+                        if (new Remult().repo(rel.toType()).metadata.idMetadata.field.options
+                            .valueType === Number)
+                            return 0;
+                        else
+                            return '';
+                }
                 return null;
+            }
             if (typeof val === 'string' || typeof val === 'number')
                 return val;
             return getEntityRef(val).getId();

package/esm/src/remult3/RepositoryImplementation.js

@@ -1015,20 +1015,24 @@ class rowHelperBase {
                 val = lu.id;
             else
                 val = this.instance[col.key];
-            if (rel && isNew && !col.allowNull && (val === undefined || null)) {
+            if (rel &&
+                isNew &&
+                !col.allowNull &&
+                (val === undefined || val === null)) {
                 if (this.remult.repo(rel.toType()).metadata.idMetadata.field.valueType ===
                     Number)
                     val = 0;
                 else
                     val = '';
             }
-            if (val !== undefined) {
-                val = col.valueConverter.toJson(val);
-                if (val !== undefined && val !== null)
-                    val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
-            }
-            if (!rel || rel.type === 'reference')
+            if (!rel || rel.type === 'reference') {
+                if (val !== undefined) {
+                    val = col.valueConverter.toJson(val);
+                    if (val !== undefined && val !== null)
+                        val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
+                }
                 d[col.key] = val;
+            }
         }
         return d;
     }
@@ -1075,12 +1079,17 @@ class rowHelperBase {
                     else
                         val = lu.id;
                 else {
-                    val = this.instance[col.key];
-                    if (!this.remult) {
-                        if (val) {
-                            let eo = getEntitySettings(val.constructor, false);
-                            if (eo) {
-                                val = getEntityRef(val).getId();
+                    if (getRelationInfo(col) && !includeRelatedEntities) {
+                        disable = true;
+                    }
+                    else {
+                        val = this.instance[col.key];
+                        if (!this.remult) {
+                            if (val) {
+                                let eo = getEntitySettings(val.constructor, false);
+                                if (eo) {
+                                    val = getEntityRef(val).getId();
+                                }
                             }
                         }
                     }

package/esm/src/remult3/remult3.js

@@ -1,5 +1,6 @@
 export {};
-//p1 - not contains - meni request
+//p1 - issue with relation that is allow null false, without a value - we set it to 0, but I couldn't filter on it using null! or using $id:0
+//p1 - in tree like shape, got an error of circular json reference with parent folder and child folders
 //p1 - sql-expression for knex
 //p1 - postgres case sensitive
 //p1 - filterToRaw should get a dbnames of - and we should create a dbnames of that supports an alias
@@ -18,7 +19,7 @@ request optional - and depends on that run `getUser` & `initRequest`
 //p1 - add schema option to create postgres data provider
 //p1 - find one i had a question about find first's different syntax from find that confused a user
 //p1 - I think there should be a way to throw a forbidden exception
-//y1 - Write some ctrl g
+//p1 - Write some ctrl g
 //y1 - get backend methods to work when specifying types for date, and entities as poco's
 //y1 - required
 //y1 - reconsider validators

package/package.json

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

package/src/data-api.d.ts

@@ -14,6 +14,7 @@ export declare class DataApi<T = any> {
         r: any[];
         findOptions: FindOptions<T>;
     }>;
+    private includeNone;
     getArray(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
     liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeContext: () => Promise<any>, queryChannel: string): Promise<void>;
     private buildWhere;

package/src/data-api.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeError = exports.determineSort = exports.DataApi = void 0;
 var tslib_1 = require("tslib");
+var internals_1 = require("../internals");
 var context_1 = require("./context");
 var rest_data_provider_1 = require("./data-providers/rest-data-provider");
 var filter_interfaces_1 = require("./filter/filter-interfaces");
@@ -109,7 +110,10 @@ var DataApi = /** @class */ (function () {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        findOptions = { load: function () { return []; } };
+                        findOptions = {
+                            load: function () { return []; },
+                            include: this.includeNone(),
+                        };
                         _a = findOptions;
                         return [4 /*yield*/, this.buildWhere(request, filterBody)];
                     case 1:
@@ -178,6 +182,26 @@ var DataApi = /** @class */ (function () {
             });
         });
     };
+    DataApi.prototype.includeNone = function () {
+        var e_1, _a;
+        var include = {};
+        try {
+            for (var _b = tslib_1.__values(this.repository.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                if ((0, internals_1.getRelationInfo)(field.options)) {
+                    include[field.key] = false;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return include;
+    };
     DataApi.prototype.getArray = function (response, request, filterBody) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r, err_2;
@@ -315,6 +339,7 @@ var DataApi = /** @class */ (function () {
                     case 3: return [4 /*yield*/, this.repository
                             .find({
                             where: { $and: where },
+                            include: this.includeNone(),
                         })
                             .then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
@@ -438,8 +463,8 @@ var DataApi = /** @class */ (function () {
                         if (!Array.isArray(body)) return [3 /*break*/, 2];
                         result_1 = [];
                         return [4 /*yield*/, (0, context_1.doTransaction)(this.remult, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var body_1, body_1_1, item, _a, _b, e_1_1;
-                                var e_1, _c;
+                                var body_1, body_1_1, item, _a, _b, e_2_1;
+                                var e_2, _c;
                                 return tslib_1.__generator(this, function (_d) {
                                     switch (_d.label) {
                                         case 0:
@@ -459,14 +484,14 @@ var DataApi = /** @class */ (function () {
                                             return [3 /*break*/, 1];
                                         case 4: return [3 /*break*/, 7];
                                         case 5:
-                                            e_1_1 = _d.sent();
-                                            e_1 = { error: e_1_1 };
+                                            e_2_1 = _d.sent();
+                                            e_2 = { error: e_2_1 };
                                             return [3 /*break*/, 7];
                                         case 6:
                                             try {
                                                 if (body_1_1 && !body_1_1.done && (_c = body_1.return)) _c.call(body_1);
                                             }
-                                            finally { if (e_1) throw e_1.error; }
+                                            finally { if (e_2) throw e_2.error; }
                                             return [7 /*endfinally*/];
                                         case 7: return [2 /*return*/];
                                     }

package/src/filter/filter-interfaces.d.ts

@@ -1,5 +1,5 @@
 import type { FieldMetadata } from '../column-interfaces';
-import type { Remult } from '../context';
+import { Remult } from '../context';
 import type { EntityFilter, EntityMetadata } from '../remult3/remult3';
 export declare class Filter {
     private apply;

package/src/filter/filter-interfaces.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__updateEntityBasedOnWhere = exports.buildFilterFromRequestParameters = exports.entityFilterToJson = exports.FilterSerializer = exports.customDatabaseFilterToken = exports.customUrlToken = exports.OrFilter = exports.AndFilter = exports.Filter = void 0;
 var tslib_1 = require("tslib");
+var context_1 = require("../context");
 var getEntityRef_1 = require("../remult3/getEntityRef");
 var relationInfoMember_1 = require("../remult3/relationInfoMember");
 var Filter = /** @class */ (function () {
@@ -70,7 +71,7 @@ var Filter = /** @class */ (function () {
                             : new filterHelper(field);
                         var found = false;
                         if (fieldToFilter_1 !== undefined && fieldToFilter_1 != null) {
-                            if (fieldToFilter_1.$id)
+                            if (fieldToFilter_1.$id !== undefined)
                                 fieldToFilter_1 = fieldToFilter_1.$id;
                             for (var key_1 in fieldToFilter_1) {
                                 if (Object.prototype.hasOwnProperty.call(fieldToFilter_1, key_1)) {
@@ -215,8 +216,18 @@ var filterHelper = /** @class */ (function () {
     filterHelper.prototype.processVal = function (val) {
         var ei = (0, getEntityRef_1.getEntitySettings)(this.metadata.valueType, false);
         if (ei) {
-            if (!val)
+            if (!val) {
+                if (val === null && !this.metadata.allowNull) {
+                    var rel = (0, relationInfoMember_1.getRelationInfo)(this.metadata.options);
+                    if ((rel === null || rel === void 0 ? void 0 : rel.type) === 'reference')
+                        if (new context_1.Remult().repo(rel.toType()).metadata.idMetadata.field.options
+                            .valueType === Number)
+                            return 0;
+                        else
+                            return '';
+                }
                 return null;
+            }
             if (typeof val === 'string' || typeof val === 'number')
                 return val;
             return (0, getEntityRef_1.getEntityRef)(val).getId();

package/src/remult3/RepositoryImplementation.js

@@ -1571,20 +1571,24 @@ var rowHelperBase = /** @class */ (function () {
                     val = lu.id;
                 else
                     val = this.instance[col.key];
-                if (rel && isNew && !col.allowNull && (val === undefined || null)) {
+                if (rel &&
+                    isNew &&
+                    !col.allowNull &&
+                    (val === undefined || val === null)) {
                     if (this.remult.repo(rel.toType()).metadata.idMetadata.field.valueType ===
                         Number)
                         val = 0;
                     else
                         val = '';
                 }
-                if (val !== undefined) {
-                    val = col.valueConverter.toJson(val);
-                    if (val !== undefined && val !== null)
-                        val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
-                }
-                if (!rel || rel.type === 'reference')
+                if (!rel || rel.type === 'reference') {
+                    if (val !== undefined) {
+                        val = col.valueConverter.toJson(val);
+                        if (val !== undefined && val !== null)
+                            val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
+                    }
                     d[col.key] = val;
+                }
             }
         }
         catch (e_25_1) { e_25 = { error: e_25_1 }; }
@@ -1673,12 +1677,17 @@ var rowHelperBase = /** @class */ (function () {
                         else
                             val = lu.id;
                     else {
-                        val = this.instance[col.key];
-                        if (!this.remult) {
-                            if (val) {
-                                var eo = (0, getEntityRef_1.getEntitySettings)(val.constructor, false);
-                                if (eo) {
-                                    val = (0, getEntityRef_1.getEntityRef)(val).getId();
+                        if ((0, relationInfoMember_1.getRelationInfo)(col) && !includeRelatedEntities) {
+                            disable = true;
+                        }
+                        else {
+                            val = this.instance[col.key];
+                            if (!this.remult) {
+                                if (val) {
+                                    var eo = (0, getEntityRef_1.getEntitySettings)(val.constructor, false);
+                                    if (eo) {
+                                        val = (0, getEntityRef_1.getEntityRef)(val).getId();
+                                    }
                                 }
                             }
                         }

package/src/remult3/remult3.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//p1 - not contains - meni request
+//p1 - issue with relation that is allow null false, without a value - we set it to 0, but I couldn't filter on it using null! or using $id:0
+//p1 - in tree like shape, got an error of circular json reference with parent folder and child folders
 //p1 - sql-expression for knex
 //p1 - postgres case sensitive
 //p1 - filterToRaw should get a dbnames of - and we should create a dbnames of that supports an alias
@@ -19,7 +20,7 @@ request optional - and depends on that run `getUser` & `initRequest`
 //p1 - add schema option to create postgres data provider
 //p1 - find one i had a question about find first's different syntax from find that confused a user
 //p1 - I think there should be a way to throw a forbidden exception
-//y1 - Write some ctrl g
+//p1 - Write some ctrl g
 //y1 - get backend methods to work when specifying types for date, and entities as poco's
 //y1 - required
 //y1 - reconsider validators