remult 0.26.23-next.1 → 0.26.23-next.2

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

@@ -285,8 +285,8 @@ export class Filter {
         this.__applyToConsumer(r);
         return r.result;
     }
-    //@internal
     static async translateCustomWhere(r, entity, remult) {
+        // Used in hagai
         let f = new customTranslator(async (filterKey, custom) => {
             let r = [];
             for (const key in entity.entityType) {

package/esm/src/remult3/RepositoryImplementation.js

@@ -1161,15 +1161,16 @@ class rowHelperBase {
 }
 export class rowHelperImplementation extends rowHelperBase {
     info;
-    repository;
+    repo;
     edp;
     _isNew;
-    constructor(info, instance, repository, edp, remult, _isNew) {
+    constructor(info, instance, repo, edp, remult, _isNew) {
         super(info.fieldsMetadata, instance, remult, _isNew);
         this.info = info;
-        this.repository = repository;
+        this.repo = repo;
         this.edp = edp;
         this._isNew = _isNew;
+        this.repository = repo;
         this.metadata = info;
         if (_isNew) {
             for (const col of info.fieldsMetadata) {
@@ -1188,12 +1189,13 @@ export class rowHelperImplementation extends rowHelperBase {
         if (Remult.entityRefInit)
             Remult.entityRefInit(this, instance);
     }
+    repository;
     clone() {
         const data = this.toApiJson(true, true);
-        return this.repository.fromJson(data, this.isNew());
+        return this.repo.fromJson(data, this.isNew());
     }
     get relations() {
-        return this.repository.relations(this.instance);
+        return this.repo.relations(this.instance);
     }
     get apiUpdateAllowed() {
         return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
@@ -1233,7 +1235,7 @@ export class rowHelperImplementation extends rowHelperBase {
             .find({ where: await this.getIdFilter() })
             .then(async (newData) => {
             if (newData.length === 0)
-                throw this.repository._notFoundError(this.id);
+                throw this.repo._notFoundError(this.id);
             await this.loadDataFrom(newData[0]);
             this.saveOriginalData();
         });
@@ -1276,7 +1278,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 await this.__validateEntity();
             let doNotSave = false;
             let e = this.buildLifeCycleEvent(() => (doNotSave = true));
-            if (!this.repository._dataProvider.isProxy) {
+            if (!this.repo._dataProvider.isProxy) {
                 for (const col of this.fields) {
                     if (col.metadata.options.saving)
                         await col.metadata.options.saving(this.instance, col, e);
@@ -1338,15 +1340,15 @@ export class rowHelperImplementation extends rowHelperBase {
                 if (updatedRow)
                     await this.loadDataFrom(updatedRow);
                 e.id = this.getId();
-                if (!this.repository._dataProvider.isProxy) {
+                if (!this.repo._dataProvider.isProxy) {
                     if (this.info.entityInfo.saved)
                         await this.info.entityInfo.saved(this.instance, e);
-                    if (this.repository.listeners)
-                        for (const listener of this.repository.listeners) {
+                    if (this.repo.listeners)
+                        for (const listener of this.repo.listeners) {
                             await listener.saved?.(this.instance, isNew);
                         }
                 }
-                await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
+                await this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                 this.saveOriginalData();
                 this._isNew = false;
                 return this.instance;
@@ -1389,20 +1391,20 @@ export class rowHelperImplementation extends rowHelperBase {
             fields: self.fields,
             id: self.getId(),
             originalId: self.getOriginalId(),
-            metadata: self.repository.metadata,
-            repository: self.repository,
+            metadata: self.repo.metadata,
+            repository: self.repo,
             preventDefault: () => preventDefault(),
-            relations: self.repository.relations(self.instance),
+            relations: self.repo.relations(self.instance),
         };
     }
     async getIdFilter() {
-        return await this.repository._translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id));
+        return await this.repo._translateWhereToFilter(this.repo.metadata.idMetadata.getIdFilter(this.id));
     }
     async delete() {
         this.__clearErrorsAndReportChanged();
         let doDelete = true;
         let e = this.buildLifeCycleEvent(() => (doDelete = false));
-        if (!this.repository._dataProvider.isProxy) {
+        if (!this.repo._dataProvider.isProxy) {
             if (this.info.entityInfo.deleting)
                 await this.info.entityInfo.deleting(this.instance, e);
         }
@@ -1410,15 +1412,15 @@ export class rowHelperImplementation extends rowHelperBase {
         try {
             if (doDelete)
                 await this.edp.delete(this.id);
-            if (!this.repository._dataProvider.isProxy) {
+            if (!this.repo._dataProvider.isProxy) {
                 if (this.info.entityInfo.deleted)
                     await this.info.entityInfo.deleted(this.instance, e);
             }
-            if (this.repository.listeners)
-                for (const listener of this.repository.listeners) {
+            if (this.repo.listeners)
+                for (const listener of this.repo.listeners) {
                     await listener.deleted?.(this.instance);
                 }
-            await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
+            await this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
             this._wasDeleted = true;
         }
         catch (err) {
@@ -1485,8 +1487,8 @@ export class rowHelperImplementation extends rowHelperBase {
             let e = this.buildLifeCycleEvent(() => { });
             await this.info.entityInfo.validation(this.instance, e);
         }
-        if (this.repository.listeners)
-            for (const listener of this.repository.listeners) {
+        if (this.repo.listeners)
+            for (const listener of this.repo.listeners) {
                 await listener.validating?.(this.instance);
             }
     }
@@ -1581,15 +1583,21 @@ export class FieldRefImplementation {
         let lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     }
+    get key() {
+        return this.metadata.key;
+    }
+    get repo() {
+        return this.helper?.repository;
+    }
     async load() {
         let lu = this.rowBase.lookups.get(this.metadata.key);
         let rel = getRelationFieldInfo(this.metadata);
         if (rel && this.helper) {
             if (rel.type === 'toMany') {
-                return (this.container[this.metadata.key] = await this.helper.repository.relations(this.container)[this.metadata.key].find());
+                return (this.container[this.metadata.key] = await this.repo.relations(this.container)[this.key].find());
             }
             else {
-                let val = await this.helper.repository
+                let val = await this.repo
                     .relations(this.container)[this.metadata.key].findOne();
                 if (val)
                     this.container[this.metadata.key] = val;

package/package.json

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

package/src/CompoundIdField.d.ts

@@ -11,7 +11,7 @@ export declare class CompoundIdField implements FieldMetadata<string> {
     fromInput(inputValue: string, inputType?: string): string;
     getDbName(): Promise<string>;
     getId(instance: any): string;
-    options: FieldOptions<unknown, unknown>;
+    options: FieldOptions;
     get valueConverter(): Required<ValueConverter<string>>;
     target: ClassType<any>;
     readonly: boolean;

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

@@ -182,6 +182,7 @@ export declare class Filter {
      */
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
     toJson(): any;
+    static translateCustomWhere<T>(r: Filter, entity: EntityMetadata<T>, remult: Remult): Promise<Filter>;
 }
 export interface FilterConsumer {
     or(orElements: Filter[]): void;

package/src/filter/filter-interfaces.js

@@ -349,7 +349,6 @@ var Filter = /** @class */ (function () {
         this.__applyToConsumer(r);
         return r.result;
     };
-    //@internal
     Filter.translateCustomWhere = function (r, entity, remult) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var f;

package/src/remult3/RepositoryImplementation.d.ts

@@ -121,10 +121,11 @@ declare abstract class rowHelperBase<T> {
 }
 export declare class rowHelperImplementation<T> extends rowHelperBase<T> implements EntityRef<T> {
     private info;
-    repository: RepositoryImplementation<T>;
+    private repo;
     private edp;
     private _isNew;
-    constructor(info: EntityFullInfo<T>, instance: T, repository: RepositoryImplementation<T>, edp: EntityDataProvider, remult: Remult, _isNew: boolean);
+    constructor(info: EntityFullInfo<T>, instance: T, repo: RepositoryImplementation<T>, edp: EntityDataProvider, remult: Remult, _isNew: boolean);
+    repository: Repository<unknown>;
     clone(): T;
     get relations(): RepositoryRelations<T>;
     get apiUpdateAllowed(): boolean;
@@ -173,6 +174,8 @@ export declare class FieldRefImplementation<entityType, valueType> implements Fi
     subscribe(listener: RefSubscriber): Unsubscribe;
     valueIsNull(): boolean;
     originalValueIsNull(): boolean;
+    get key(): keyof entityType;
+    get repo(): Repository<entityType>;
     load(): Promise<valueType>;
     target?: ClassType<any>;
     reportObserved(): void;

package/src/remult3/RepositoryImplementation.js

@@ -1925,15 +1925,16 @@ var rowHelperBase = /** @class */ (function () {
 }());
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
-    function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
+    function rowHelperImplementation(info, instance, repo, edp, remult, _isNew) {
         var e_30, _a;
         var _this = _super.call(this, info.fieldsMetadata, instance, remult, _isNew) || this;
         _this.info = info;
-        _this.repository = repository;
+        _this.repo = repo;
         _this.edp = edp;
         _this._isNew = _isNew;
         _this._wasDeleted = false;
         _this._saving = false;
+        _this.repository = repo;
         _this.metadata = info;
         if (_isNew) {
             try {
@@ -1965,11 +1966,11 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     }
     rowHelperImplementation.prototype.clone = function () {
         var data = this.toApiJson(true, true);
-        return this.repository.fromJson(data, this.isNew());
+        return this.repo.fromJson(data, this.isNew());
     };
     Object.defineProperty(rowHelperImplementation.prototype, "relations", {
         get: function () {
-            return this.repository.relations(this.instance);
+            return this.repo.relations(this.instance);
         },
         enumerable: false,
         configurable: true
@@ -2037,7 +2038,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0:
                                         if (newData.length === 0)
-                                            throw this.repository._notFoundError(this.id);
+                                            throw this.repo._notFoundError(this.id);
                                         return [4 /*yield*/, this.loadDataFrom(newData[0])];
                                     case 1:
                                         _a.sent();
@@ -2117,7 +2118,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 2:
                         doNotSave_1 = false;
                         e = this.buildLifeCycleEvent(function () { return (doNotSave_1 = true); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 12];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 12];
                         _t.label = 3;
                     case 3:
                         _t.trys.push([3, 8, 9, 10]);
@@ -2232,18 +2233,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _t.label = 26;
                     case 26:
                         e.id = this.getId();
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 36];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 36];
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 28];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
                     case 27:
                         _t.sent();
                         _t.label = 28;
                     case 28:
-                        if (!this.repository.listeners) return [3 /*break*/, 36];
+                        if (!this.repo.listeners) return [3 /*break*/, 36];
                         _t.label = 29;
                     case 29:
                         _t.trys.push([29, 34, 35, 36]);
-                        _j = tslib_1.__values(this.repository.listeners), _k = _j.next();
+                        _j = tslib_1.__values(this.repo.listeners), _k = _j.next();
                         _t.label = 30;
                     case 30:
                         if (!!_k.done) return [3 /*break*/, 33];
@@ -2266,7 +2267,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_33) throw e_33.error; }
                         return [7 /*endfinally*/];
-                    case 36: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
+                    case 36: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
                     case 37:
                         _t.sent();
                         this.saveOriginalData();
@@ -2344,17 +2345,17 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             fields: self.fields,
             id: self.getId(),
             originalId: self.getOriginalId(),
-            metadata: self.repository.metadata,
-            repository: self.repository,
+            metadata: self.repo.metadata,
+            repository: self.repo,
             preventDefault: function () { return preventDefault(); },
-            relations: self.repository.relations(self.instance),
+            relations: self.repo.relations(self.instance),
         };
     };
     rowHelperImplementation.prototype.getIdFilter = function () {
         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 0: return [4 /*yield*/, this.repo._translateWhereToFilter(this.repo.metadata.idMetadata.getIdFilter(this.id))];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2371,7 +2372,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         this.__clearErrorsAndReportChanged();
                         doDelete = true;
                         e = this.buildLifeCycleEvent(function () { return (doDelete = false); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 2];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 2];
                         if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, e)];
                     case 1:
@@ -2388,18 +2389,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _e.sent();
                         _e.label = 5;
                     case 5:
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 7];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 7];
                         if (!this.info.entityInfo.deleted) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
                     case 6:
                         _e.sent();
                         _e.label = 7;
                     case 7:
-                        if (!this.repository.listeners) return [3 /*break*/, 15];
+                        if (!this.repo.listeners) return [3 /*break*/, 15];
                         _e.label = 8;
                     case 8:
                         _e.trys.push([8, 13, 14, 15]);
-                        _a = tslib_1.__values(this.repository.listeners), _b = _a.next();
+                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
                         _e.label = 9;
                     case 9:
                         if (!!_b.done) return [3 /*break*/, 12];
@@ -2422,7 +2423,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_36) throw e_36.error; }
                         return [7 /*endfinally*/];
-                    case 15: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
+                    case 15: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
                     case 16:
                         _e.sent();
                         this._wasDeleted = true;
@@ -2608,11 +2609,11 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _h.sent();
                         _h.label = 9;
                     case 9:
-                        if (!this.repository.listeners) return [3 /*break*/, 17];
+                        if (!this.repo.listeners) return [3 /*break*/, 17];
                         _h.label = 10;
                     case 10:
                         _h.trys.push([10, 15, 16, 17]);
-                        _c = tslib_1.__values(this.repository.listeners), _d = _c.next();
+                        _c = tslib_1.__values(this.repo.listeners), _d = _c.next();
                         _h.label = 11;
                     case 11:
                         if (!!_d.done) return [3 /*break*/, 14];
@@ -2776,6 +2777,21 @@ var FieldRefImplementation = /** @class */ (function () {
         var lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     };
+    Object.defineProperty(FieldRefImplementation.prototype, "key", {
+        get: function () {
+            return this.metadata.key;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(FieldRefImplementation.prototype, "repo", {
+        get: function () {
+            var _a;
+            return (_a = this.helper) === null || _a === void 0 ? void 0 : _a.repository;
+        },
+        enumerable: false,
+        configurable: true
+    });
     FieldRefImplementation.prototype.load = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var lu, rel, _a, _b, val;
@@ -2788,9 +2804,9 @@ var FieldRefImplementation = /** @class */ (function () {
                         if (!(rel.type === 'toMany')) return [3 /*break*/, 2];
                         _a = this.container;
                         _b = this.metadata.key;
-                        return [4 /*yield*/, this.helper.repository.relations(this.container)[this.metadata.key].find()];
+                        return [4 /*yield*/, this.repo.relations(this.container)[this.key].find()];
                     case 1: return [2 /*return*/, (_a[_b] = _c.sent())];
-                    case 2: return [4 /*yield*/, this.helper.repository
+                    case 2: return [4 /*yield*/, this.repo
                             .relations(this.container)[this.metadata.key].findOne()];
                     case 3:
                         val = _c.sent();

package/src/remult3/remult3.d.ts

@@ -18,8 +18,8 @@ export interface EntityRefBase<entityType> extends Subscribable {
     error: string | undefined;
     getId(): idType<entityType>;
     getOriginalId(): idType<entityType>;
-    repository: Repository<entityType>;
-    metadata: EntityMetadata<entityType>;
+    repository: Repository<unknown>;
+    metadata: EntityMetadata<unknown>;
     toApiJson(): any;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
     readonly apiUpdateAllowed: boolean;