remult 2.7.32 → 2.7.34

package/esm/server/remult-admin.js

@@ -2,6 +2,7 @@ import { getRelationFieldInfo, } from '../src/remult3/relationInfoMember.js';
 import { Filter } from '../src/filter/filter-interfaces.js';
 import { getHtml } from './get-remult-admin-html.js';
 import { getValueList } from '../src/remult3/RepositoryImplementation.js';
+import { InputTypes } from '../inputTypes.js';
 export default function remultAdminHtml(options) {
     const { rootPath, head } = options;
     return getHtml()
@@ -76,7 +77,7 @@ export function buildEntityInfo(options) {
                     caption: x.caption,
                     relationToOne: relation,
                     inputType: x.inputType,
-                    type: x.valueConverter.fieldTypeInDb == 'json'
+                    type: x.inputType === InputTypes.json
                         ? 'json'
                         : x.valueType === Number
                             ? 'number'
@@ -95,7 +96,7 @@ export function buildEntityInfo(options) {
         if (metadata.apiReadAllowed) {
             let superKey = metadata.key;
             let caption = metadata.caption;
-            const nbOfEntities = entities.filter(e => e.key === metadata.key).length;
+            const nbOfEntities = entities.filter((e) => e.key === metadata.key).length;
             if (nbOfEntities > 0) {
                 superKey = metadata.key + '_ext_' + nbOfEntities;
                 caption = metadata.caption + '*'.repeat(nbOfEntities);

package/esm/src/remult3/Fields.js

@@ -7,6 +7,7 @@ import { relationInfoMemberInOptions } from './relationInfoMember.js';
 import { remultStatic } from '../remult-static.js';
 import { addValidator } from './addValidator.js';
 import { isOfType } from '../isOfType.js';
+import { InputTypes } from '../../inputTypes.js';
 const validateNumber = createValueValidator((x) => {
     return !isNaN(x) && isFinite(x);
 });
@@ -22,9 +23,13 @@ export class Fields {
         if (op.valueConverter && !op.valueConverter.fieldTypeInDb)
             //@ts-ignore
             op.valueConverter.fieldTypeInDb = 'json';
+        if (op.valueType && !op.valueType.inputType)
+            //@ts-ignore
+            op.valueType.inputType = InputTypes.json;
         return Field(undefined, {
             valueConverter: {
                 fieldTypeInDb: 'json',
+                inputType: InputTypes.json,
             },
         }, ...options);
     }

package/esm/src/valueConverters.js

@@ -51,6 +51,8 @@ export class ValueConverters {
             var d = val;
             if (typeof d === 'string' || typeof d === 'number')
                 d = new Date(d);
+            if (d === undefined)
+                return undefined;
             if (!d || d == null)
                 return null;
             if (d.getHours() == 0)

package/inputTypes.d.ts

@@ -6,4 +6,5 @@ export declare class InputTypes {
     static email: string;
     static tel: string;
     static time: string;
+    static json: string;
 }

package/inputTypes.js

@@ -11,6 +11,7 @@ var InputTypes = /** @class */ (function () {
     InputTypes.email = 'email';
     InputTypes.tel = 'tel';
     InputTypes.time = 'time';
+    InputTypes.json = 'json';
     return InputTypes;
 }());
 exports.InputTypes = InputTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "2.7.32",
+    "version": "2.7.34",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.js

@@ -217,6 +217,11 @@ var KnexEntityDataProvider = /** @class */ (function () {
             });
         });
     };
+    KnexEntityDataProvider.prototype.getEntityFrom = function (e) {
+        if (this.entity.options.sqlExpression)
+            return this.knex.fromRaw(e.$entityName);
+        return this.knex(e.$entityName);
+    };
     KnexEntityDataProvider.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, br, r, result, row, key, element;
@@ -230,7 +235,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
                         r = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .count()
                                 .where(function (b) { return r.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -279,7 +284,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                             }
                             finally { if (e_3) throw e_3.error; }
                         }
-                        query = this.knex(e.$entityName).select(cols);
+                        query = this.getEntityFrom(e).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
                         br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         options.where.__applyToConsumer(br);
@@ -395,7 +400,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
                         where = _d.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .update(updateObject)
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
@@ -418,7 +423,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .delete()
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -472,7 +477,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 10:
-                        insert = this.knex(e.$entityName).insert(insertObject);
+                        insert = this.getEntityFrom(e).insert(insertObject);
                         if (!(0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field)) return [3 /*break*/, 15];
                         if (!(this.knex.client.config.client === 'mysql2' ||
                             this.knex.client.config.client === 'mysql')) return [3 /*break*/, 12];