remult 0.18.1-exp.39 → 0.18.1-exp.40

package/esm/src/remult-proxy.js

@@ -18,6 +18,7 @@ export class RemultProxy {
                 getEntityRef: (...args2) => self.remultFactory().repo(...args).getEntityRef(...args2),
                 insert: (args2) => self.remultFactory().repo(...args).insert(args2),
                 liveQuery: (...args2) => self.remultFactory().repo(...args).liveQuery(...args2),
+                addToCache: (args2) => self.remultFactory().repo(...args).addToCache(args2),
                 get metadata() {
                     return self.remultFactory().repo(...args).metadata;
                 },

package/esm/src/remult3/RepositoryImplementation.d.ts

@@ -42,7 +42,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     liveQuery(options?: FindOptions<entityType>): any;
-    find(options: FindOptions<entityType>): Promise<entityType[]>;
+    find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
     buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
     fromJsonArray(jsonItems: any[], load?: (entity: FieldsMetadata<entityType>) => FieldMetadata[]): Promise<entityType[]>;
     private loadManyToOneForManyRows;

package/esm/src/remult3/RepositoryImplementation.js

@@ -101,6 +101,7 @@ export class RepositoryImplementation {
         this.idCache.set(id, row);
         return await row;
     }
+    //TODO - Used to prevent unnecessary many to one relations
     addToCache(item) {
         if (item)
             this.idCache.set(this.getEntityRef(item).getId() + '', item);
@@ -219,11 +220,15 @@ export class RepositoryImplementation {
             }
         };
     }
-    async find(options) {
+    async find(options, skipOrderByAndLimit = false) {
         Remult.onFind(this._info, options);
         if (!options)
             options = {};
         let opt = await this.buildEntityDataProviderFindOptions(options);
+        if (skipOrderByAndLimit) {
+            delete opt.orderBy;
+            delete opt.limit;
+        }
         let rawRows = await this.edp.find(opt);
         let result = await this.loadManyToOneForManyRows(rawRows, options.load);
         return result;
@@ -275,7 +280,7 @@ export class RepositoryImplementation {
             }
         }
         async function loadManyToOne(repo, toLoad) {
-            let rows = await repo.find({ where: repo.metadata.idMetadata.getIdFilter(...toLoad) });
+            let rows = await repo.find({ where: repo.metadata.idMetadata.getIdFilter(...toLoad) }, true);
             for (const r of rows) {
                 repo.addToCache(r);
             }
@@ -353,7 +358,7 @@ export class RepositoryImplementation {
                 this.cache.set(key, cacheInfo);
             }
         }
-        r = this.find(skipOrderByAndLimit ? { ...options, orderBy: undefined } : { ...options, limit: 1 }).then(async (items) => {
+        r = this.find({ ...options, limit: 1 }, skipOrderByAndLimit).then(async (items) => {
             let r = undefined;
             if (items.length > 0)
                 r = items[0];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.18.1-exp.39",
+    "version": "0.18.1-exp.40",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/src/remult-proxy.js

@@ -96,6 +96,10 @@ var RemultProxy = /** @class */ (function () {
                     }
                     return (_a = (_b = self.remultFactory()).repo.apply(_b, tslib_1.__spread(args))).liveQuery.apply(_a, tslib_1.__spread(args2));
                 },
+                addToCache: function (args2) {
+                    var _a;
+                    return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spread(args)).addToCache(args2);
+                },
                 get metadata() {
                     var _a;
                     return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spread(args)).metadata;

package/src/remult3/RepositoryImplementation.d.ts

@@ -42,7 +42,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     liveQuery(options?: FindOptions<entityType>): any;
-    find(options: FindOptions<entityType>): Promise<entityType[]>;
+    find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
     buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
     fromJsonArray(jsonItems: any[], load?: (entity: FieldsMetadata<entityType>) => FieldMetadata[]): Promise<entityType[]>;
     private loadManyToOneForManyRows;

package/src/remult3/RepositoryImplementation.js

@@ -157,6 +157,7 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
+    //TODO - Used to prevent unnecessary many to one relations
     RepositoryImplementation.prototype.addToCache = function (item) {
         if (item)
             this.idCache.set(this.getEntityRef(item).getId() + '', item);
@@ -345,7 +346,8 @@ var RepositoryImplementation = /** @class */ (function () {
             }
         };
     };
-    RepositoryImplementation.prototype.find = function (options) {
+    RepositoryImplementation.prototype.find = function (options, skipOrderByAndLimit) {
+        if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var opt, rawRows, result;
             return tslib_1.__generator(this, function (_a) {
@@ -357,6 +359,10 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [4 /*yield*/, this.buildEntityDataProviderFindOptions(options)];
                     case 1:
                         opt = _a.sent();
+                        if (skipOrderByAndLimit) {
+                            delete opt.orderBy;
+                            delete opt.limit;
+                        }
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
                         rawRows = _a.sent();
@@ -424,7 +430,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     var _a, e_9, _b;
                     return tslib_1.__generator(this, function (_c) {
                         switch (_c.label) {
-                            case 0: return [4 /*yield*/, repo.find({ where: (_a = repo.metadata.idMetadata).getIdFilter.apply(_a, tslib_1.__spread(toLoad)) })];
+                            case 0: return [4 /*yield*/, repo.find({ where: (_a = repo.metadata.idMetadata).getIdFilter.apply(_a, tslib_1.__spread(toLoad)) }, true)];
                             case 1:
                                 rows = _c.sent();
                                 try {
@@ -635,7 +641,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         _a.label = 2;
                     case 2:
-                        r = this.find(skipOrderByAndLimit ? tslib_1.__assign(tslib_1.__assign({}, options), { orderBy: undefined }) : tslib_1.__assign(tslib_1.__assign({}, options), { limit: 1 })).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        r = this.find(tslib_1.__assign(tslib_1.__assign({}, options), { limit: 1 }), skipOrderByAndLimit).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var r;
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {