remult 0.13.20 → 0.13.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.13.20",
+    "version": "0.13.21",
     "description": "remult core lib",
     "homepage": "https://remult.dev/",
     "repository": {

package/src/remult3/RepositoryImplementation.d.ts

@@ -26,17 +26,17 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     query(options?: QueryOptions<entityType>): QueryResult<entityType>;
     getEntityRef(entity: entityType): EntityRef<entityType>;
     delete(id: (entityType extends {
-        id: number;
+        id?: number;
     } ? number : entityType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number))): Promise<void>;
     delete(item: entityType): Promise<void>;
     insert(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     insert(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     update(id: (entityType extends {
-        id: number;
+        id?: number;
     } ? number : entityType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number)), entity: Partial<OmitEB<entityType>>): Promise<entityType>;
     private getRefForExistingRow;
     save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
@@ -157,6 +157,7 @@ export declare class FieldRefImplementation<entityType, valueType> implements Fi
     get originalValue(): any;
     private rawOriginalValue;
     setId(id: (string | number)): void;
+    getId(): any;
     get inputValue(): string;
     set inputValue(val: string);
     valueChanged(): boolean;

package/src/remult3/RepositoryImplementation.js

@@ -200,49 +200,50 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.insert = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entity_1, entity_1_1, item, e_4_1, ref;
-            var e_4, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            var r, entity_1, entity_1_1, item, _a, _b, e_4_1, ref;
+            var e_4, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 9];
-                        _b.label = 1;
+                        r = [];
+                        _d.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, 7, 8]);
+                        _d.trys.push([1, 6, 7, 8]);
                         entity_1 = tslib_1.__values(entity), entity_1_1 = entity_1.next();
-                        _b.label = 2;
+                        _d.label = 2;
                     case 2:
                         if (!!entity_1_1.done) return [3 /*break*/, 5];
                         item = entity_1_1.value;
+                        _b = (_a = r).push;
                         return [4 /*yield*/, this.insert(item)];
                     case 3:
-                        _b.sent();
-                        _b.label = 4;
+                        _b.apply(_a, [_d.sent()]);
+                        _d.label = 4;
                     case 4:
                         entity_1_1 = entity_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_4_1 = _b.sent();
+                        e_4_1 = _d.sent();
                         e_4 = { error: e_4_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (entity_1_1 && !entity_1_1.done && (_a = entity_1.return)) _a.call(entity_1);
+                            if (entity_1_1 && !entity_1_1.done && (_c = entity_1.return)) _c.call(entity_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [3 /*break*/, 13];
+                    case 8: return [2 /*return*/, r];
                     case 9:
                         ref = getEntityRef(entity, false);
                         if (!ref) return [3 /*break*/, 11];
                         if (!ref.isNew())
                             throw "Item is not new";
                         return [4 /*yield*/, ref.save()];
-                    case 10: return [2 /*return*/, _b.sent()];
+                    case 10: return [2 /*return*/, _d.sent()];
                     case 11: return [4 /*yield*/, this.getEntityRef(this.create(entity)).save()];
-                    case 12: return [2 /*return*/, _b.sent()];
-                    case 13: return [2 /*return*/];
+                    case 12: return [2 /*return*/, _d.sent()];
                 }
             });
         });
@@ -298,7 +299,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 1];
-                        return [2 /*return*/, Promise.all(entity.map(function (x) { return _this.insert(x); }))];
+                        return [2 /*return*/, Promise.all(entity.map(function (x) { return _this.save(x); }))];
                     case 1:
                         ref = getEntityRef(entity, false);
                         if (!ref) return [3 /*break*/, 3];
@@ -649,23 +650,24 @@ var RepositoryImplementation = /** @class */ (function () {
 exports.RepositoryImplementation = RepositoryImplementation;
 function __updateEntityBasedOnWhere(entityDefs, where, r) {
     var w = filter_interfaces_1.Filter.fromEntityFilter(entityDefs, where);
+    var emptyFunction = function () { };
     if (w) {
         w.__applyToConsumer({
-            custom: function () { },
-            databaseCustom: function () { },
-            containsCaseInsensitive: function () { },
-            isDifferentFrom: function () { },
+            custom: emptyFunction,
+            databaseCustom: emptyFunction,
+            containsCaseInsensitive: emptyFunction,
+            isDifferentFrom: emptyFunction,
             isEqualTo: function (col, val) {
                 r[col.key] = val;
             },
-            isGreaterOrEqualTo: function () { },
-            isGreaterThan: function () { },
-            isIn: function () { },
-            isLessOrEqualTo: function () { },
-            isLessThan: function () { },
-            isNotNull: function () { },
-            isNull: function () { },
-            or: function () { }
+            isGreaterOrEqualTo: emptyFunction,
+            isGreaterThan: emptyFunction,
+            isIn: emptyFunction,
+            isLessOrEqualTo: emptyFunction,
+            isLessThan: emptyFunction,
+            isNotNull: emptyFunction,
+            isNull: emptyFunction,
+            or: emptyFunction
         });
     }
 }
@@ -1895,6 +1897,12 @@ var FieldRefImplementation = /** @class */ (function () {
     FieldRefImplementation.prototype.setId = function (id) {
         this.value = id;
     };
+    FieldRefImplementation.prototype.getId = function () {
+        var lu = this.rowBase.lookups.get(this.metadata.key);
+        if (lu)
+            return lu.id != undefined ? lu.id : null;
+        return this.value;
+    };
     Object.defineProperty(FieldRefImplementation.prototype, "inputValue", {
         get: function () {
             this.reportObserved();

package/src/remult3/remult3.d.ts

@@ -42,7 +42,7 @@ export interface Subscribable {
 }
 export declare type FieldsRef<entityType> = {
     [Properties in keyof OmitEB<entityType>]: entityType[Properties] extends {
-        id: (number | string);
+        id?: (number | string);
     } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
 } & {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldRef<entityType, any>;
@@ -63,10 +63,15 @@ export declare type SortSegments<entityType> = {
 };
 export interface IdFieldRef<entityType, valueType> extends FieldRef<entityType, valueType> {
     setId(id: valueType extends {
-        id: number;
+        id?: number;
     } ? number : valueType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number)): any;
+    getId(): (valueType extends {
+        id?: number;
+    } ? number : valueType extends {
+        id?: string;
+    } ? string : (string | number));
 }
 export interface FieldRef<entityType = any, valueType = any> extends Subscribable {
     error: string;
@@ -111,9 +116,9 @@ export interface Repository<entityType> {
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>): Promise<entityType>;
     /** returns the items that matches the idm the result is cached unless specified differently in the `options` parameter */
     findId(id: entityType extends {
-        id: number;
+        id?: number;
     } ? number : entityType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number), options?: FindFirstOptionsBase<entityType>): Promise<entityType>;
     /**  An alternative form of fetching data from the API server, which is intended for operating on large numbers of entity objects.
      *
@@ -152,15 +157,15 @@ export interface Repository<entityType> {
      * taskRepo.update(task.id,{...task,completed:true})
     */
     update(id: (entityType extends {
-        id: number;
+        id?: number;
     } ? number : entityType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number)), item: Partial<OmitEB<entityType>>): Promise<entityType>;
     /** Deletes an Item*/
     delete(id: (entityType extends {
-        id: number;
+        id?: number;
     } ? number : entityType extends {
-        id: string;
+        id?: string;
     } ? string : (string | number))): Promise<void>;
     delete(item: entityType): Promise<void>;
     /** Creates an instance of an item. It'll not be saved to the data source unless `save` or `insert` will be called for that item */
@@ -205,7 +210,7 @@ export declare type EntityOrderBy<entityType> = {
  */
 export declare type EntityFilter<entityType> = {
     [Properties in keyof Partial<OmitEB<entityType>>]?: (Partial<OmitEB<entityType>>[Properties] extends (number | Date | undefined) ? ComparisonValueFilter<Partial<OmitEB<entityType>>[Properties]> : Partial<OmitEB<entityType>>[Properties] extends (string | undefined) ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<OmitEB<entityType>>[Properties] extends (boolean | undefined) ? ValueFilter<boolean> : Partial<OmitEB<entityType>>[Properties] extends ({
-        id: (string | number);
+        id?: (string | number);
     } | undefined) ? IdFilter<Partial<OmitEB<entityType>>[Properties]> : ValueFilter<Partial<OmitEB<entityType>>[Properties]>) & ContainsStringValueFilter;
 } & {
     $or?: EntityFilter<entityType>[];
@@ -230,7 +235,7 @@ export interface ContainsStringValueFilter {
 }
 export declare type IdFilter<valueType> = ValueFilter<valueType> | {
     $id: ValueFilter<valueType extends {
-        id: number;
+        id?: number;
     } ? number : string>;
 };
 export interface LoadOptions<entityType> {

package/src/shared-tests/entityWithValidations.js

@@ -64,26 +64,12 @@ var entityWithValidations = /** @class */ (function (_super) {
         remult3_1.Entity('', {
             allowApiCrud: true,
             saving: function (t) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-                var e;
                 return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!t.name || t.name.length < 3)
-                                t._.fields.name.error = 'invalid';
-                            if (!(t._.isNew() && (!t.myId || t.myId == 0))) return [3 /*break*/, 2];
-                            return [4 /*yield*/, t.remult.repo(entityWithValidations_1).find({
-                                    orderBy: { myId: "desc" },
-                                    limit: 1
-                                })];
-                        case 1:
-                            e = _a.sent();
-                            t.myId = e.length ? e[0].myId + 1 : 1;
-                            _a.label = 2;
-                        case 2:
-                            if (!exports.testConfiguration.restDbRunningOnServer)
-                                entityWithValidations_1.savingRowCount++;
-                            return [2 /*return*/];
-                    }
+                    if (!t.name || t.name.length < 3)
+                        t._.fields.name.error = 'invalid';
+                    if (!exports.testConfiguration.restDbRunningOnServer)
+                        entityWithValidations_1.savingRowCount++;
+                    return [2 /*return*/];
                 });
             }); }
         }),

package/src/tests/TestDataApiResponse.js

@@ -7,22 +7,22 @@ var TestDataApiResponse = /** @class */ (function () {
     TestDataApiResponse.prototype.progress = function (progress) {
     };
     TestDataApiResponse.prototype.success = function (data) {
-        fail('didnt expect success: ' + JSON.stringify(data));
+        throw new Error(('didnt expect success: ' + JSON.stringify(data)));
     };
     TestDataApiResponse.prototype.forbidden = function () {
-        fail('didnt expect forbidden:');
+        throw new Error('didnt expect forbidden:');
     };
     TestDataApiResponse.prototype.created = function (data) {
-        fail('didnt expect created: ' + JSON.stringify(data));
+        throw new Error('didnt expect created: ' + JSON.stringify(data));
     };
     TestDataApiResponse.prototype.deleted = function () {
-        fail('didnt expect deleted:');
+        throw new Error('didnt expect deleted:');
     };
     TestDataApiResponse.prototype.notFound = function () {
-        fail('not found');
+        throw new Error('not found');
     };
     TestDataApiResponse.prototype.error = function (data) {
-        fail('error: ' + data + " " + JSON.stringify(data));
+        throw new Error('error: ' + data + " " + JSON.stringify(data));
     };
     return TestDataApiResponse;
 }());

package/src/tests/d.d.ts

@@ -3,5 +3,4 @@ export declare class d extends EntityBase {
     id: number;
     b: number;
     static count: number;
-    doIt(): Promise<boolean>;
 }

package/src/tests/d.js

@@ -2,22 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.d = void 0;
 var tslib_1 = require("tslib");
-var server_action_1 = require("../server-action");
 var remult3_1 = require("../remult3");
-var dWithPrefilter_1 = require("./dWithPrefilter");
 var d = /** @class */ (function (_super) {
     tslib_1.__extends(d, _super);
     function d() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    d.prototype.doIt = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                dWithPrefilter_1.dWithPrefilter.count++;
-                return [2 /*return*/, true];
-            });
-        });
-    };
     d.count = 0;
     tslib_1.__decorate([
         remult3_1.Fields.integer(),
@@ -27,12 +17,6 @@ var d = /** @class */ (function (_super) {
         remult3_1.Fields.integer(),
         tslib_1.__metadata("design:type", Number)
     ], d.prototype, "b", void 0);
-    tslib_1.__decorate([
-        server_action_1.BackendMethod({ allowed: true }),
-        tslib_1.__metadata("design:type", Function),
-        tslib_1.__metadata("design:paramtypes", []),
-        tslib_1.__metadata("design:returntype", Promise)
-    ], d.prototype, "doIt", null);
     d = tslib_1.__decorate([
         remult3_1.Entity('d1', {
             allowApiCrud: true

package/src/tests/testModel/models.d.ts

@@ -5,7 +5,6 @@ export declare class Status {
     static closed: Status;
     static hold: Status;
     constructor(id: number, name: string);
-    toString(): string;
 }
 export declare class TestStatus {
     id?: string;

package/src/tests/testModel/models.js

@@ -9,9 +9,6 @@ var Status = /** @class */ (function () {
         this.name = name;
     }
     Status_1 = Status;
-    Status.prototype.toString = function () {
-        return this.name;
-    };
     var Status_1;
     Status.open = new Status_1(0, "open");
     Status.closed = new Status_1(1, "closed");