remult 0.25.7-exp.0 → 0.25.7-exp.1

package/esm/postgres/postgres-data-provider.js

@@ -80,6 +80,9 @@ class PostgresBridgeToSQLCommand {
     }
     values = [];
     addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val) {
         if (Array.isArray(val))
             val = JSON.stringify(val);
         this.values.push(val);

package/esm/postgres/schema-builder.js

@@ -65,9 +65,9 @@ export class PostgresSchemaBuilder {
         }
         const where = [];
         if (schema) {
-            where.push(`table_schema=${cmd.addParameterAndReturnSqlToken(this.removeQuotes(schema))}`);
+            where.push(`table_schema=${cmd.param(this.removeQuotes(schema))}`);
         }
-        where.push(`table_name=${cmd.addParameterAndReturnSqlToken(this.removeQuotes(table))}`);
+        where.push(`table_name=${cmd.param(this.removeQuotes(table))}`);
         return where.join(' AND ');
     }
     schemaAndName(e) {
@@ -162,7 +162,7 @@ CREATE table ${this.schemaAndName(e)} (${result}\r\n)`;
             const colName = e.$dbNameOf(c(entity));
             if ((await cmd.execute(`SELECT 1 FROM information_schema.columns WHERE ` +
                 `${this.whereTableAndSchema(cmd, e)} ` +
-                `AND column_name=${cmd.addParameterAndReturnSqlToken(colName.toLocaleLowerCase())}`)).rows.length == 0) {
+                `AND column_name=${cmd.param(colName.toLocaleLowerCase())}`)).rows.length == 0) {
                 let sql = `ALTER table ${this.schemaAndName(e)} ` +
                     `ADD column ${postgresColumnSyntax(c(entity), colName)}`;
                 if (PostgresSchemaBuilder.logToConsole)

package/esm/remult-sql-js.js

@@ -92,6 +92,9 @@ class SqlJsCommand {
         return new SqlJsSqlResult((await this.db).exec(sql, this.values));
     }
     addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val) {
         if (val instanceof Date)
             val = val.valueOf();
         const key = ':' + ++this.i;

package/esm/src/data-providers/sql-database.js

@@ -58,7 +58,10 @@ export class SqlDatabase {
                     createCommand: () => {
                         let c = x.createCommand();
                         return {
-                            addParameterAndReturnSqlToken: (x) => c.addParameterAndReturnSqlToken(x),
+                            addParameterAndReturnSqlToken: (val) => {
+                                return c.param(val);
+                            },
+                            param: (x) => c.param(x),
                             execute: async (sql) => {
                                 if (completed)
                                     throw "can't run a command after the transaction was completed";
@@ -139,7 +142,10 @@ class LogSQLCommand {
     }
     args = {};
     addParameterAndReturnSqlToken(val) {
-        let r = this.origin.addParameterAndReturnSqlToken(val);
+        return this.param(val);
+    }
+    param(val, name) {
+        let r = this.origin.param(val);
         this.args[r] = val;
         return r;
     }
@@ -321,8 +327,7 @@ class ActualSQLServerDataProvider {
                         added = true;
                     else
                         statement += ', ';
-                    statement +=
-                        e.$dbNameOf(x) + ' = ' + r.addParameterAndReturnSqlToken(v);
+                    statement += e.$dbNameOf(x) + ' = ' + r.param(v);
                 }
             }
         }
@@ -364,7 +369,7 @@ class ActualSQLServerDataProvider {
                         vals += ', ';
                     }
                     cols += e.$dbNameOf(x);
-                    vals += r.addParameterAndReturnSqlToken(v);
+                    vals += r.param(v);
                 }
             }
         }
@@ -382,6 +387,9 @@ class myDummySQLCommand {
         throw new Error('Method not implemented.');
     }
     addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val) {
         if (val === null)
             return 'null';
         if (val instanceof Date)
@@ -410,7 +418,7 @@ async function bulkInsert(array, db) {
         sql += items
             .map((row) => '(' +
             row.$.toArray()
-                .map((f) => c.addParameterAndReturnSqlToken(f.metadata.valueConverter.toDb(f.value)))
+                .map((f) => c.param(f.metadata.valueConverter.toDb(f.value)))
                 .join(', ') +
             ')')
             .join(',');

package/esm/src/data-providers/web-sql-data-provider.js

@@ -101,6 +101,9 @@ class WebSqlBridgeToSQLCommand {
     }
     values = [];
     addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val) {
         this.values.push(val);
         return '~' + this.values.length + '~';
     }

package/esm/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -61,7 +61,7 @@ export class FilterConsumerBridgeToSqlRequest {
                 this.addToWhere(this.nameProvider.$dbNameOf(col) +
                     ' in (' +
                     val
-                        .map((x) => this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x)))
+                        .map((x) => this.r.param(col.valueConverter.toDb(x)))
                         .join(',') +
                     ')');
             else
@@ -110,7 +110,7 @@ export class FilterConsumerBridgeToSqlRequest {
                 ' ' +
                 operator +
                 ' ' +
-                this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
+                this.r.param(col.valueConverter.toDb(val));
             this.addToWhere(x);
         })());
     }
@@ -141,10 +141,15 @@ export class CustomSqlFilterBuilder {
         this.r = r;
     }
     sql = '';
-    addParameterAndReturnSqlToken(val, field) {
-        if (field)
+    /** @deprecated @deprecated use `param` instead*/
+    addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val, field) {
+        if (typeof field === 'object' && field.valueConverter.toDb) {
             val = field.valueConverter.toDb(val);
-        return this.r.addParameterAndReturnSqlToken(val);
+        }
+        return this.r.param(val);
     }
     async filterToRaw(repo, condition) {
         return SqlDatabase.filterToRaw(repo, condition, this);

package/esm/src/remult3/RepositoryImplementation.js

@@ -39,6 +39,12 @@ export class RepositoryImplementation {
     dataProvider;
     _info;
     defaultFindOptions;
+    notFoundError(id) {
+        return {
+            message: `id ${id} not found in entity ${this.metadata.key}`,
+            httpStatusCode: 404,
+        };
+    }
     [getInternalKey]() {
         return this;
     }
@@ -191,8 +197,9 @@ export class RepositoryImplementation {
                 return this.edp.delete(item);
             else {
                 let ref2 = await this.findId(item);
-                if (ref2)
-                    return await getEntityRef(ref2).delete();
+                if (!ref2)
+                    throw this.notFoundError(item);
+                return await getEntityRef(ref2).delete();
             }
         let ref2 = this.getRefForExistingRow(item, undefined);
         if (!this.dataProvider.isProxy)
@@ -269,7 +276,7 @@ export class RepositoryImplementation {
         else {
             const r = await ref.reload();
             if (!r)
-                throw new Error('Not Found');
+                throw this.notFoundError(ref.id);
             for (const key in entity) {
                 if (Object.prototype.hasOwnProperty.call(entity, key)) {
                     let f = ref.fields[key];
@@ -1147,7 +1154,11 @@ export class rowHelperImplementation extends rowHelperBase {
         this.__clearErrorsAndReportChanged();
     }
     async reload() {
-        await this.edp.find({ where: this.getIdFilter() }).then(async (newData) => {
+        await this.edp
+            .find({ where: await this.getIdFilter() })
+            .then(async (newData) => {
+            if (newData.length === 0)
+                throw this.repository.notFoundError(this.id);
             await this.loadDataFrom(newData[0]);
             this.saveOriginalData();
         });
@@ -1232,7 +1243,7 @@ export class rowHelperImplementation extends rowHelperBase {
                     if (!wasChanged)
                         return this.instance;
                     if (doNotSave) {
-                        updatedRow = (await this.edp.find({ where: this.getIdFilter() }))[0];
+                        updatedRow = (await this.edp.find({ where: await this.getIdFilter() }))[0];
                     }
                     else {
                         updatedRow = await this.edp.update(this.id, changesOnly);
@@ -1275,8 +1286,8 @@ export class rowHelperImplementation extends rowHelperBase {
             relations: self.repository.relations(self.instance),
         };
     }
-    getIdFilter() {
-        return Filter.fromEntityFilter(this.metadata, this.repository.metadata.idMetadata.getIdFilter(this.id));
+    async getIdFilter() {
+        return await this.repository.translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id));
     }
     async delete() {
         this.__clearErrorsAndReportChanged();

package/esm/src/remult3/remult3.js

@@ -10,10 +10,12 @@ export {};
 #
 
 //y1 - getFields didn't work for kobi in the home component
-//p1 - JYC - change name of add parameter and .... to token - param
-//p1 - Hint names for sql parameters
+
+
 //p1 - add section to Fields doc, explaining field type in db
 /*p1 - JYC - Delete many, update many, insert many
+//p1 - @jycouet regarding required - are you ok with leaving '' as not a good value? (0 will be a good value)
+
   - post + __action=delet
   */
 //p1 - JYC - there should be a required that says not null or undefined, but space, 0 etc... should be ok - NOAM- check if removing zero is good enough
@@ -21,6 +23,23 @@ export {};
   - soft delete
   - delete restrict (implicit, or user selected - and if so, how) (delete & update of id)
 
+*/
+/*y1 currency.ts:10 Uncaught TypeError: Currency_1 is not a constructor
+
+@ValueListFieldType()
+export class Currency {
+  constructor(
+    public id: number,
+    public caption: string,
+    public symbol: string
+  ) {}
+  static shekel = new Currency(1, 'Shekel', '₪');
+  static dollar = new Currency(2, 'Dollar', '$');
+  static euro = new Currency(3, 'Euro', '€');
+  static pound = new Currency(4, 'Pound', '£');
+  static yen = new Currency(5, 'Yen', '¥');
+}
+
 */
 //y1 - admin url!
 //y1 - consider sql expression gets a dbnames of it's own (that already has the "tableName" defined correctly) maybe also the filter translator
@@ -31,7 +50,8 @@ export {};
 //y1 - talk about the parameter issue with backend methods
 //y1 - select data provider per entity https://discord.com/channels/975754286384418847/976006081748807690/1201415305885397003
 //y1 - migrations
-//y2 - live query refresh of view on table update
+//y1 - live query refresh of view on table update
+//y1 - main vs master
 //y2 - livequery for findfirst (@JY)
 /*y2 -
 //y2 - allow api update only for new rows

package/esm/src/validators.js

@@ -1,5 +1,5 @@
 export class Validators {
-    static required = createValidator(async (_, e) => e.value != null && e.value != undefined && e.value !== '' && e.value != 0, 'Should not be empty');
+    static required = createValidator(async (_, e) => e.value != null && e.value != undefined && e.value !== '', 'Should not be empty');
     static unique = createValidator(async (_, e) => {
         if (!e.entityRef)
             throw 'unique validation may only work on columns that are attached to an entity';

package/package.json

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

package/postgres/postgres-data-provider.js

@@ -123,6 +123,9 @@ var PostgresBridgeToSQLCommand = /** @class */ (function () {
         this.values = [];
     }
     PostgresBridgeToSQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    PostgresBridgeToSQLCommand.prototype.param = function (val) {
         if (Array.isArray(val))
             val = JSON.stringify(val);
         this.values.push(val);

package/postgres/schema-builder.js

@@ -82,9 +82,9 @@ var PostgresSchemaBuilder = /** @class */ (function () {
         }
         var where = [];
         if (schema) {
-            where.push("table_schema=".concat(cmd.addParameterAndReturnSqlToken(this.removeQuotes(schema))));
+            where.push("table_schema=".concat(cmd.param(this.removeQuotes(schema))));
         }
-        where.push("table_name=".concat(cmd.addParameterAndReturnSqlToken(this.removeQuotes(table))));
+        where.push("table_name=".concat(cmd.param(this.removeQuotes(table))));
         return where.join(' AND ');
     };
     PostgresSchemaBuilder.prototype.schemaAndName = function (e) {
@@ -290,7 +290,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                         colName = e.$dbNameOf(c(entity));
                         return [4 /*yield*/, cmd.execute("SELECT 1 FROM information_schema.columns WHERE " +
                                 "".concat(this.whereTableAndSchema(cmd, e), " ") +
-                                "AND column_name=".concat(cmd.addParameterAndReturnSqlToken(colName.toLocaleLowerCase())))];
+                                "AND column_name=".concat(cmd.param(colName.toLocaleLowerCase())))];
                     case 3:
                         if (!((_a.sent()).rows.length == 0)) return [3 /*break*/, 5];
                         sql = "ALTER table ".concat(this.schemaAndName(e), " ") +

package/remult-sql-js.js

@@ -183,6 +183,9 @@ var SqlJsCommand = /** @class */ (function () {
         });
     };
     SqlJsCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    SqlJsCommand.prototype.param = function (val) {
         if (val instanceof Date)
             val = val.valueOf();
         var key = ':' + ++this.i;

package/src/data-providers/sql-database.js

@@ -109,9 +109,10 @@ var SqlDatabase = /** @class */ (function () {
                                 createCommand: function () {
                                     var c = x.createCommand();
                                     return {
-                                        addParameterAndReturnSqlToken: function (x) {
-                                            return c.addParameterAndReturnSqlToken(x);
+                                        addParameterAndReturnSqlToken: function (val) {
+                                            return c.param(val);
                                         },
+                                        param: function (x) { return c.param(x); },
                                         execute: function (sql) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                             return tslib_1.__generator(this, function (_a) {
                                                 if (completed)
@@ -217,7 +218,10 @@ var LogSQLCommand = /** @class */ (function () {
         this.args = {};
     }
     LogSQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
-        var r = this.origin.addParameterAndReturnSqlToken(val);
+        return this.param(val);
+    };
+    LogSQLCommand.prototype.param = function (val, name) {
+        var r = this.origin.param(val);
         this.args[r] = val;
         return r;
     };
@@ -490,8 +494,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                             added = true;
                                         else
                                             statement += ', ';
-                                        statement +=
-                                            e.$dbNameOf(x) + ' = ' + r.addParameterAndReturnSqlToken(v);
+                                        statement += e.$dbNameOf(x) + ' = ' + r.param(v);
                                     }
                                 }
                             }
@@ -572,7 +575,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                             vals += ', ';
                                         }
                                         cols += e.$dbNameOf(x);
-                                        vals += r.addParameterAndReturnSqlToken(v);
+                                        vals += r.param(v);
                                     }
                                 }
                             }
@@ -607,6 +610,9 @@ var myDummySQLCommand = /** @class */ (function () {
         throw new Error('Method not implemented.');
     };
     myDummySQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    myDummySQLCommand.prototype.param = function (val) {
         if (val === null)
             return 'null';
         if (val instanceof Date)
@@ -651,9 +657,7 @@ function bulkInsert(array, db) {
                                         .map(function (row) {
                                         return '(' +
                                             row.$.toArray()
-                                                .map(function (f) {
-                                                return c.addParameterAndReturnSqlToken(f.metadata.valueConverter.toDb(f.value));
-                                            })
+                                                .map(function (f) { return c.param(f.metadata.valueConverter.toDb(f.value)); })
                                                 .join(', ') +
                                             ')';
                                     })

package/src/data-providers/web-sql-data-provider.js

@@ -182,6 +182,9 @@ var WebSqlBridgeToSQLCommand = /** @class */ (function () {
         this.values = [];
     }
     WebSqlBridgeToSQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    WebSqlBridgeToSQLCommand.prototype.param = function (val) {
         this.values.push(val);
         return '~' + this.values.length + '~';
     };

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -36,7 +36,9 @@ export declare class CustomSqlFilterBuilder {
     private r;
     constructor(r: SqlCommandWithParameters);
     sql: string;
-    addParameterAndReturnSqlToken<valueType>(val: valueType, field?: FieldMetadata<valueType>): string;
+    /** @deprecated @deprecated use `param` instead*/
+    addParameterAndReturnSqlToken(val: any): string;
+    param<valueType>(val: valueType, field?: FieldMetadata<valueType>): string;
     filterToRaw<entityType>(repo: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>): Promise<string>;
 }
 export declare function isDbReadonly<entityType>(field: FieldMetadata, dbNames: EntityDbNames<entityType>): boolean;

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -135,9 +135,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     this.addToWhere(this.nameProvider.$dbNameOf(col) +
                         ' in (' +
                         val
-                            .map(function (x) {
-                            return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x));
-                        })
+                            .map(function (x) { return _this.r.param(col.valueConverter.toDb(x)); })
                             .join(',') +
                         ')');
                 else
@@ -199,7 +197,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     ' ' +
                     operator +
                     ' ' +
-                    this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
+                    this.r.param(col.valueConverter.toDb(val));
                 this.addToWhere(x);
                 return [2 /*return*/];
             });
@@ -243,10 +241,15 @@ var CustomSqlFilterBuilder = /** @class */ (function () {
         this.r = r;
         this.sql = '';
     }
-    CustomSqlFilterBuilder.prototype.addParameterAndReturnSqlToken = function (val, field) {
-        if (field)
+    /** @deprecated @deprecated use `param` instead*/
+    CustomSqlFilterBuilder.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    CustomSqlFilterBuilder.prototype.param = function (val, field) {
+        if (typeof field === 'object' && field.valueConverter.toDb) {
             val = field.valueConverter.toDb(val);
-        return this.r.addParameterAndReturnSqlToken(val);
+        }
+        return this.r.param(val);
     };
     CustomSqlFilterBuilder.prototype.filterToRaw = function (repo, condition) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {

package/src/remult3/RepositoryImplementation.d.ts

@@ -17,6 +17,10 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     private dataProvider;
     private _info;
     private defaultFindOptions?;
+    notFoundError(id: any): {
+        message: string;
+        httpStatusCode: number;
+    };
     [getInternalKey](): this;
     createAfterFilter(orderBy: EntityOrderBy<entityType>, lastRow: entityType): Promise<EntityFilter<entityType>>;
     relations(item: entityType): RepositoryRelations<entityType>;

package/src/remult3/RepositoryImplementation.js

@@ -47,6 +47,12 @@ var RepositoryImplementation = /** @class */ (function () {
         this.idCache = new Map();
         this.cache = new Map();
     }
+    RepositoryImplementation.prototype.notFoundError = function (id) {
+        return {
+            message: "id ".concat(id, " not found in entity ").concat(this.metadata.key),
+            httpStatusCode: 404,
+        };
+    };
     RepositoryImplementation.prototype[repository_internals_js_1.getInternalKey] = function () {
         return this;
     };
@@ -253,7 +259,8 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 1: return [4 /*yield*/, this.findId(item)];
                     case 2:
                         ref2_1 = _a.sent();
-                        if (!ref2_1) return [3 /*break*/, 4];
+                        if (!ref2_1)
+                            throw this.notFoundError(item);
                         return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(ref2_1).delete()];
                     case 3: return [2 /*return*/, _a.sent()];
                     case 4:
@@ -411,7 +418,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 5:
                         r = _a.sent();
                         if (!r)
-                            throw new Error('Not Found');
+                            throw this.notFoundError(ref.id);
                         for (key in entity) {
                             if (Object.prototype.hasOwnProperty.call(entity, key)) {
                                 f = ref.fields[key];
@@ -1807,13 +1814,24 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.reload = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, _b;
+            var _c;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.edp.find({ where: this.getIdFilter() }).then(function (newData) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _b = (_a = this.edp)
+                            .find;
+                        _c = {};
+                        return [4 /*yield*/, this.getIdFilter()];
+                    case 1: return [4 /*yield*/, _b.apply(_a, [(_c.where = _d.sent(), _c)])
+                            .then(function (newData) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.loadDataFrom(newData[0])];
+                                    case 0:
+                                        if (newData.length === 0)
+                                            throw this.repository.notFoundError(this.id);
+                                        return [4 /*yield*/, this.loadDataFrom(newData[0])];
                                     case 1:
                                         _a.sent();
                                         this.saveOriginalData();
@@ -1821,8 +1839,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             });
                         }); })];
-                    case 1:
-                        _a.sent();
+                    case 2:
+                        _d.sent();
                         this._reportChangedToEntityAndFields();
                         return [2 /*return*/, this.instance];
                 }
@@ -1865,12 +1883,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.save = function (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave_1, e, _b, _c, col, e_29_1, d, ignoreKeys, _d, _e, field, f, updatedRow, isNew, changesOnly, wasChanged, key, element, _f, _g, listener, e_30_1, err_1;
-            var e_29, _h, e_31, _j, e_30, _k;
-            return tslib_1.__generator(this, function (_l) {
-                switch (_l.label) {
+            var doNotSave_1, e, _b, _c, col, e_29_1, d, ignoreKeys, _d, _e, field, f, updatedRow, isNew, changesOnly, wasChanged, key, element, _f, _g, _h, _j, listener, e_30_1, err_1;
+            var e_29, _k, e_31, _l, _m, e_30, _o;
+            return tslib_1.__generator(this, function (_p) {
+                switch (_p.label) {
                     case 0:
-                        _l.trys.push([0, , 35, 36]);
+                        _p.trys.push([0, , 36, 37]);
                         if (this._saving)
                             throw new Error('cannot save while entity is already saving');
                         this._saving = true;
@@ -1883,36 +1901,36 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.__validateEntity()];
                     case 1:
                         // no need
-                        _l.sent();
-                        _l.label = 2;
+                        _p.sent();
+                        _p.label = 2;
                     case 2:
                         doNotSave_1 = false;
                         e = this.buildLifeCycleEvent(function () { return (doNotSave_1 = true); });
                         if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 12];
-                        _l.label = 3;
+                        _p.label = 3;
                     case 3:
-                        _l.trys.push([3, 8, 9, 10]);
+                        _p.trys.push([3, 8, 9, 10]);
                         _b = tslib_1.__values(this.fields), _c = _b.next();
-                        _l.label = 4;
+                        _p.label = 4;
                     case 4:
                         if (!!_c.done) return [3 /*break*/, 7];
                         col = _c.value;
                         if (!col.metadata.options.saving) return [3 /*break*/, 6];
                         return [4 /*yield*/, col.metadata.options.saving(this.instance, col, e)];
                     case 5:
-                        _l.sent();
-                        _l.label = 6;
+                        _p.sent();
+                        _p.label = 6;
                     case 6:
                         _c = _b.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_29_1 = _l.sent();
+                        e_29_1 = _p.sent();
                         e_29 = { error: e_29_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
-                            if (_c && !_c.done && (_h = _b.return)) _h.call(_b);
+                            if (_c && !_c.done && (_k = _b.return)) _k.call(_b);
                         }
                         finally { if (e_29) throw e_29.error; }
                         return [7 /*endfinally*/];
@@ -1920,8 +1938,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 12];
                         return [4 /*yield*/, this.info.entityInfo.saving(this.instance, e)];
                     case 11:
-                        _l.sent();
-                        _l.label = 12;
+                        _p.sent();
+                        _p.label = 12;
                     case 12:
                         this.__assertValidity();
                         d = this.copyDataToObject(this.isNew());
@@ -1943,21 +1961,21 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         catch (e_31_1) { e_31 = { error: e_31_1 }; }
                         finally {
                             try {
-                                if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
+                                if (_e && !_e.done && (_l = _d.return)) _l.call(_d);
                             }
                             finally { if (e_31) throw e_31.error; }
                         }
                         updatedRow = void 0;
                         isNew = this.isNew();
-                        _l.label = 13;
+                        _p.label = 13;
                     case 13:
-                        _l.trys.push([13, 32, , 34]);
+                        _p.trys.push([13, 33, , 35]);
                         (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 15];
                         return [4 /*yield*/, this.edp.insert(d)];
                     case 14:
-                        updatedRow = _l.sent();
-                        return [3 /*break*/, 19];
+                        updatedRow = _p.sent();
+                        return [3 /*break*/, 20];
                     case 15:
                         changesOnly = {};
                         wasChanged = false;
@@ -1973,71 +1991,74 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         if (!wasChanged)
                             return [2 /*return*/, this.instance];
-                        if (!doNotSave_1) return [3 /*break*/, 17];
-                        return [4 /*yield*/, this.edp.find({ where: this.getIdFilter() })];
-                    case 16:
-                        updatedRow = (_l.sent())[0];
-                        return [3 /*break*/, 19];
-                    case 17: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
-                    case 18:
-                        updatedRow = _l.sent();
-                        _l.label = 19;
-                    case 19: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
-                    case 20:
-                        _l.sent();
-                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 30];
-                        if (!this.info.entityInfo.saved) return [3 /*break*/, 22];
-                        return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
+                        if (!doNotSave_1) return [3 /*break*/, 18];
+                        _g = (_f = this.edp).find;
+                        _m = {};
+                        return [4 /*yield*/, this.getIdFilter()];
+                    case 16: return [4 /*yield*/, _g.apply(_f, [(_m.where = _p.sent(), _m)])];
+                    case 17:
+                        updatedRow = (_p.sent())[0];
+                        return [3 /*break*/, 20];
+                    case 18: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
+                    case 19:
+                        updatedRow = _p.sent();
+                        _p.label = 20;
+                    case 20: return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 21:
-                        _l.sent();
-                        _l.label = 22;
+                        _p.sent();
+                        if (!!this.remult.dataProvider.isProxy) return [3 /*break*/, 31];
+                        if (!this.info.entityInfo.saved) return [3 /*break*/, 23];
+                        return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
                     case 22:
-                        if (!this.repository.listeners) return [3 /*break*/, 30];
-                        _l.label = 23;
+                        _p.sent();
+                        _p.label = 23;
                     case 23:
-                        _l.trys.push([23, 28, 29, 30]);
-                        _f = tslib_1.__values(this.repository.listeners.filter(function (x) { return x.saved; })), _g = _f.next();
-                        _l.label = 24;
+                        if (!this.repository.listeners) return [3 /*break*/, 31];
+                        _p.label = 24;
                     case 24:
-                        if (!!_g.done) return [3 /*break*/, 27];
-                        listener = _g.value;
-                        return [4 /*yield*/, listener.saved(this.instance, isNew)];
+                        _p.trys.push([24, 29, 30, 31]);
+                        _h = tslib_1.__values(this.repository.listeners.filter(function (x) { return x.saved; })), _j = _h.next();
+                        _p.label = 25;
                     case 25:
-                        _l.sent();
-                        _l.label = 26;
+                        if (!!_j.done) return [3 /*break*/, 28];
+                        listener = _j.value;
+                        return [4 /*yield*/, listener.saved(this.instance, isNew)];
                     case 26:
-                        _g = _f.next();
-                        return [3 /*break*/, 24];
-                    case 27: return [3 /*break*/, 30];
-                    case 28:
-                        e_30_1 = _l.sent();
-                        e_30 = { error: e_30_1 };
-                        return [3 /*break*/, 30];
+                        _p.sent();
+                        _p.label = 27;
+                    case 27:
+                        _j = _h.next();
+                        return [3 /*break*/, 25];
+                    case 28: return [3 /*break*/, 31];
                     case 29:
+                        e_30_1 = _p.sent();
+                        e_30 = { error: e_30_1 };
+                        return [3 /*break*/, 31];
+                    case 30:
                         try {
-                            if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
+                            if (_j && !_j.done && (_o = _h.return)) _o.call(_h);
                         }
                         finally { if (e_30) throw e_30.error; }
                         return [7 /*endfinally*/];
-                    case 30: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
-                    case 31:
-                        _l.sent();
+                    case 31: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
+                    case 32:
+                        _p.sent();
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
-                    case 32:
-                        err_1 = _l.sent();
-                        return [4 /*yield*/, this.catchSaveErrors(err_1)];
                     case 33:
-                        _l.sent();
-                        return [3 /*break*/, 34];
-                    case 34: return [3 /*break*/, 36];
-                    case 35:
+                        err_1 = _p.sent();
+                        return [4 /*yield*/, this.catchSaveErrors(err_1)];
+                    case 34:
+                        _p.sent();
+                        return [3 /*break*/, 35];
+                    case 35: return [3 /*break*/, 37];
+                    case 36:
                         this.isLoading = false;
                         this._reportChangedToEntityAndFields();
                         this._saving = false;
                         return [7 /*endfinally*/];
-                    case 36: return [2 /*return*/];
+                    case 37: return [2 /*return*/];
                 }
             });
         });
@@ -2057,7 +2078,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         };
     };
     rowHelperImplementation.prototype.getIdFilter = function () {
-        return filter_interfaces_js_1.Filter.fromEntityFilter(this.metadata, this.repository.metadata.idMetadata.getIdFilter(this.id));
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.repository.translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id))];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {

package/src/remult3/remult3.js

@@ -11,10 +11,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 #
 
 //y1 - getFields didn't work for kobi in the home component
-//p1 - JYC - change name of add parameter and .... to token - param
-//p1 - Hint names for sql parameters
+
+
 //p1 - add section to Fields doc, explaining field type in db
 /*p1 - JYC - Delete many, update many, insert many
+//p1 - @jycouet regarding required - are you ok with leaving '' as not a good value? (0 will be a good value)
+
   - post + __action=delet
   */
 //p1 - JYC - there should be a required that says not null or undefined, but space, 0 etc... should be ok - NOAM- check if removing zero is good enough
@@ -22,6 +24,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
   - soft delete
   - delete restrict (implicit, or user selected - and if so, how) (delete & update of id)
 
+*/
+/*y1 currency.ts:10 Uncaught TypeError: Currency_1 is not a constructor
+
+@ValueListFieldType()
+export class Currency {
+  constructor(
+    public id: number,
+    public caption: string,
+    public symbol: string
+  ) {}
+  static shekel = new Currency(1, 'Shekel', '₪');
+  static dollar = new Currency(2, 'Dollar', '$');
+  static euro = new Currency(3, 'Euro', '€');
+  static pound = new Currency(4, 'Pound', '£');
+  static yen = new Currency(5, 'Yen', '¥');
+}
+
 */
 //y1 - admin url!
 //y1 - consider sql expression gets a dbnames of it's own (that already has the "tableName" defined correctly) maybe also the filter translator
@@ -32,7 +51,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //y1 - talk about the parameter issue with backend methods
 //y1 - select data provider per entity https://discord.com/channels/975754286384418847/976006081748807690/1201415305885397003
 //y1 - migrations
-//y2 - live query refresh of view on table update
+//y1 - live query refresh of view on table update
+//y1 - main vs master
 //y2 - livequery for findfirst (@JY)
 /*y2 -
 //y2 - allow api update only for new rows

package/src/sql-command.d.ts

@@ -16,7 +16,9 @@ export interface SqlCommand extends SqlCommandWithParameters {
     execute(sql: string): Promise<SqlResult>;
 }
 export interface SqlCommandWithParameters {
+    /** @deprecated @deprecated use `param` instead*/
     addParameterAndReturnSqlToken(val: any): string;
+    param(val: any): string;
 }
 export interface SqlResult {
     rows: any[];

package/src/validators.js

@@ -8,7 +8,7 @@ var Validators = /** @class */ (function () {
     var _a;
     _a = Validators;
     Validators.required = createValidator(function (_, e) { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(_a, function (_b) {
-        return [2 /*return*/, e.value != null && e.value != undefined && e.value !== '' && e.value != 0];
+        return [2 /*return*/, e.value != null && e.value != undefined && e.value !== ''];
     }); }); }, 'Should not be empty');
     Validators.unique = createValidator(function (_, e) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var _b;