remult 0.21.1 → 0.22.0

package/src/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doTransaction = exports.EventSource = exports.queryConfig = exports.Allow = exports.setControllerSettings = exports.ClassHelper = exports.classHelpers = exports.allEntities = exports.Remult = exports.isBackend = void 0;
+exports.doTransaction = exports.EventSource = exports.queryConfig = exports.Allow = exports.setControllerSettings = exports.ClassHelper = exports.classHelpers = exports.allEntities = exports.Remult = exports.isBackend = exports.RemultAsyncLocalStorage = void 0;
 var tslib_1 = require("tslib");
 var server_action_1 = require("./server-action");
 var rest_data_provider_1 = require("./data-providers/rest-data-provider");
@@ -9,8 +9,42 @@ var LiveQueryClient_1 = require("./live-query/LiveQueryClient");
 var SseSubscriptionClient_1 = require("./live-query/SseSubscriptionClient");
 var remult_proxy_1 = require("./remult-proxy");
 var buildRestDataProvider_1 = require("./buildRestDataProvider");
+var RemultAsyncLocalStorage = /** @class */ (function () {
+    function RemultAsyncLocalStorage(remultObjectStorage) {
+        this.remultObjectStorage = remultObjectStorage;
+    }
+    RemultAsyncLocalStorage.enable = function () {
+        ;
+        remult_proxy_1.remult.remultFactory = function () {
+            var r = RemultAsyncLocalStorage.instance.getRemult();
+            if (r)
+                return r;
+            else
+                throw new Error('remult object was requested outside of a valid context, try running it within initApi or a remult request cycle');
+        };
+    };
+    RemultAsyncLocalStorage.disable = function () {
+        ;
+        remult_proxy_1.remult.resetFactory();
+    };
+    RemultAsyncLocalStorage.prototype.run = function (remult, callback) {
+        if (this.remultObjectStorage)
+            this.remultObjectStorage.run(remult, callback);
+        else
+            callback();
+    };
+    RemultAsyncLocalStorage.prototype.getRemult = function () {
+        if (!this.remultObjectStorage) {
+            throw new Error("can't use static remult in this environment, `async_hooks` were not initialized");
+        }
+        return this.remultObjectStorage.getStore();
+    };
+    RemultAsyncLocalStorage.instance = new RemultAsyncLocalStorage(undefined);
+    return RemultAsyncLocalStorage;
+}());
+exports.RemultAsyncLocalStorage = RemultAsyncLocalStorage;
 function isBackend() {
-    return server_action_1.actionInfo.runningOnServer;
+    return server_action_1.actionInfo.runningOnServer || !remult_proxy_1.remult.dataProvider.isProxy;
 }
 exports.isBackend = isBackend;
 var Remult = /** @class */ (function () {
@@ -24,7 +58,7 @@ var Remult = /** @class */ (function () {
         this.liveQueryPublisher = {
             itemChanged: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                 return [2 /*return*/];
-            }); }); }
+            }); }); },
         };
         /* @internal*/
         this.liveQuerySubscriber = new LiveQueryClient_1.LiveQueryClient(function () { return _this.apiClient; }, function () { var _a; return (_a = _this.user) === null || _a === void 0 ? void 0 : _a.id; });
@@ -33,7 +67,7 @@ var Remult = /** @class */ (function () {
         /** The api client that will be used by `remult` to perform calls to the `api` */
         this.apiClient = {
             url: '/api',
-            subscriptionClient: new SseSubscriptionClient_1.SseSubscriptionClient()
+            subscriptionClient: new SseSubscriptionClient_1.SseSubscriptionClient(),
         };
         if (provider && provider.getEntityDataProvider) {
             this.dataProvider = provider;
@@ -42,7 +76,7 @@ var Remult = /** @class */ (function () {
         if (buildRestDataProvider_1.isExternalHttpProvider(provider)) {
             this.apiClient.httpClient = provider;
         }
-        else if (typeof (provider) === "function")
+        else if (typeof provider === 'function')
             this.apiClient.httpClient = provider;
         else if (provider) {
             var apiClient = provider;
@@ -68,10 +102,10 @@ var Remult = /** @class */ (function () {
             dataProvider = this.dataProvider;
         var dpCache = this.repCache.get(dataProvider);
         if (!dpCache)
-            this.repCache.set(dataProvider, dpCache = new Map());
+            this.repCache.set(dataProvider, (dpCache = new Map()));
         var r = dpCache.get(entity);
         if (!r) {
-            dpCache.set(entity, r = new RepositoryImplementation_1.RepositoryImplementation(entity, this, dataProvider));
+            dpCache.set(entity, (r = new RepositoryImplementation_1.RepositoryImplementation(entity, this, dataProvider)));
         }
         return r;
     };
@@ -143,7 +177,7 @@ var Remult = /** @class */ (function () {
                 }
             }
         }
-        else if (typeof (allowed) === "function") {
+        else if (typeof allowed === 'function') {
             return allowed(instance, this);
         }
         else
@@ -156,28 +190,37 @@ var Remult = /** @class */ (function () {
      * @param backendMethod - the backend method to call
      * @param classInstance - the class instance of the backend method, for static backend methods use undefined
      * @param args - the arguments to send to the backend method
-    */
+     */
     Remult.prototype.call = function (backendMethod, classInstance) {
         var args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             args[_i - 2] = arguments[_i];
         }
-        var z = (backendMethod[server_action_1.serverActionField]);
+        var z = backendMethod[server_action_1.serverActionField];
         if (!z.doWork)
-            throw Error("The method received is not a valid backend method");
+            throw Error('The method received is not a valid backend method');
         //@ts-ignore
         return z.doWork(args, classInstance, this.apiClient.url, buildRestDataProvider_1.buildRestDataProvider(this.apiClient.httpClient));
     };
     Remult.prototype.clearAllCache = function () {
         this.repCache.clear();
     };
+    Remult.run = function (callback, options) {
+        var remult = new Remult();
+        if (options.dataProvider)
+            remult.dataProvider = options.dataProvider;
+        var r;
+        RemultAsyncLocalStorage.instance.run(remult, function () {
+            r = callback();
+        });
+        return r;
+    };
     /** A helper callback that can be used to debug and trace all find operations. Useful in debugging scenarios */
     Remult.onFind = function (metadata, options) { };
     return Remult;
 }());
 exports.Remult = Remult;
 remult_proxy_1.RemultProxy.defaultRemult = new Remult();
-;
 exports.allEntities = [];
 exports.classHelpers = new Map();
 var ClassHelper = /** @class */ (function () {
@@ -192,7 +235,7 @@ function setControllerSettings(target, options) {
     while (true) {
         var helper = exports.classHelpers.get(r);
         if (!helper)
-            exports.classHelpers.set(r, helper = new ClassHelper());
+            exports.classHelpers.set(r, (helper = new ClassHelper()));
         helper.classes.set(target, options);
         var p = Object.getPrototypeOf(r.prototype);
         if (p == null)
@@ -217,13 +260,13 @@ var Allow = /** @class */ (function () {
             if (args[0].authenticated)
                 return args[0].authenticated();
         }
-        return remult_proxy_1.RemultProxy.defaultRemult.authenticated();
+        return remult_proxy_1.remult.authenticated();
     };
     return Allow;
 }());
 exports.Allow = Allow;
 exports.queryConfig = {
-    defaultPageSize: 200
+    defaultPageSize: 200,
 };
 var EventSource = /** @class */ (function () {
     function EventSource() {
@@ -244,7 +287,7 @@ var EventSource = /** @class */ (function () {
                                 }];
                     }
                 });
-            }); }
+            }); },
         };
     }
     EventSource.prototype.fire = function () {
@@ -299,7 +342,7 @@ function doTransaction(remult, what) {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        remult.dataProvider = (ds);
+                                        remult.dataProvider = ds;
                                         remult.liveQueryPublisher = trans;
                                         return [4 /*yield*/, what()];
                                     case 1:
@@ -334,7 +377,7 @@ var transactionLiveQueryPublisher = /** @class */ (function () {
             return tslib_1.__generator(this, function (_b) {
                 items = this.transactionItems.get(entityKey);
                 if (!items) {
-                    this.transactionItems.set(entityKey, items = []);
+                    this.transactionItems.set(entityKey, (items = []));
                 }
                 _loop_1 = function (c) {
                     if (c.oldId !== undefined) {

package/src/data-api.d.ts

@@ -36,4 +36,3 @@ export interface DataApiRequest {
 }
 export declare function determineSort(sortUrlParm: string, dirUrlParam: string): any;
 export declare function serializeError(data: ErrorInfo): ErrorInfo<any>;
-export declare function getLiveQueryChannel(queryId: string, userId: string): string;

package/src/data-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLiveQueryChannel = exports.serializeError = exports.determineSort = exports.DataApi = void 0;
+exports.serializeError = exports.determineSort = exports.DataApi = void 0;
 var tslib_1 = require("tslib");
 var filter_interfaces_1 = require("./filter/filter-interfaces");
 var context_1 = require("./context");
@@ -13,40 +13,38 @@ var DataApi = /** @class */ (function () {
         this.remult = remult;
     }
     DataApi.prototype.httpGet = function (res, req, serializeContext) {
-        var _a;
-        var action = req === null || req === void 0 ? void 0 : req.get("__action");
+        var action = req === null || req === void 0 ? void 0 : req.get('__action');
         if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id));
+            return this.liveQuery(res, req, undefined, serializeContext, action.substring(rest_data_provider_1.liveQueryAction.length));
         switch (action) {
-            case "get":
-            case "count":
+            case 'get':
+            case 'count':
                 return this.count(res, req, undefined);
         }
         return this.getArray(res, req, undefined);
     };
     DataApi.prototype.httpPost = function (res, req, body, serializeContext) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var action, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var action, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        action = req === null || req === void 0 ? void 0 : req.get("__action");
+                        action = req === null || req === void 0 ? void 0 : req.get('__action');
                         if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id))];
-                        _c = action;
-                        switch (_c) {
-                            case "get": return [3 /*break*/, 1];
-                            case "count": return [3 /*break*/, 2];
-                            case "endLiveQuery": return [3 /*break*/, 3];
+                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeContext, action.substring(rest_data_provider_1.liveQueryAction.length))];
+                        _a = action;
+                        switch (_a) {
+                            case 'get': return [3 /*break*/, 1];
+                            case 'count': return [3 /*break*/, 2];
+                            case 'endLiveQuery': return [3 /*break*/, 3];
                         }
                         return [3 /*break*/, 5];
                     case 1: return [2 /*return*/, this.getArray(res, req, body)];
                     case 2: return [2 /*return*/, this.count(res, req, body)];
-                    case 3: return [4 /*yield*/, this.remult.liveQueryStorage.remove(getLiveQueryChannel(body.id, (_b = this.remult.user) === null || _b === void 0 ? void 0 : _b.id))];
+                    case 3: return [4 /*yield*/, this.remult.liveQueryStorage.remove(body.id)];
                     case 4:
-                        _d.sent();
-                        res.success("ok");
+                        _b.sent();
+                        res.success('ok');
                         return [2 /*return*/];
                     case 5: return [2 /*return*/, this.post(res, body)];
                 }
@@ -93,7 +91,8 @@ var DataApi = /** @class */ (function () {
                         return [4 /*yield*/, this.buildWhere(request, filterBody)];
                     case 2: return [4 /*yield*/, _d.apply(_c, [_f.sent()])];
                     case 3:
-                        _b.apply(_a, [(_e.count = +(_f.sent()), _e)]);
+                        _b.apply(_a, [(_e.count = +(_f.sent()),
+                                _e)]);
                         return [3 /*break*/, 5];
                     case 4:
                         err_1 = _f.sent();
@@ -117,16 +116,16 @@ var DataApi = /** @class */ (function () {
                     case 1:
                         _a.where = _b.sent();
                         if (request) {
-                            sort = request.get("_sort");
+                            sort = request.get('_sort');
                             if (sort != undefined) {
                                 dir = request.get('_order');
                                 findOptions.orderBy = determineSort(sort, dir);
                             }
-                            limit = +request.get("_limit");
+                            limit = +request.get('_limit');
                             if (!limit && DataApi.defaultGetLimit)
                                 limit = DataApi.defaultGetLimit;
                             findOptions.limit = limit;
-                            findOptions.page = +request.get("_page");
+                            findOptions.page = +request.get('_page');
                         }
                         if (!this.remult.isAllowed(this.repository.metadata.options.apiRequireId)) return [3 /*break*/, 3];
                         hasId_1 = false;
@@ -150,7 +149,7 @@ var DataApi = /** @class */ (function () {
                                 isLessThan: function () { },
                                 isNotNull: function () { },
                                 isNull: function () { },
-                                or: function () { }
+                                or: function () { },
                             });
                         }
                         if (!hasId_1) {
@@ -158,8 +157,7 @@ var DataApi = /** @class */ (function () {
                             throw new server_action_1.ForbiddenError();
                         }
                         _b.label = 3;
-                    case 3: return [4 /*yield*/, this.repository.find(findOptions)
-                            .then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    case 3: return [4 /*yield*/, this.repository.find(findOptions).then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var _this = this;
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
@@ -235,7 +233,7 @@ var DataApi = /** @class */ (function () {
                         return [4 /*yield*/, this.remult.liveQueryStorage.add({
                                 entityKey: this.repository.metadata.key,
                                 id: queryChannel,
-                                data: data
+                                data: data,
                             })];
                     case 4:
                         _b.sent();
@@ -261,7 +259,7 @@ var DataApi = /** @class */ (function () {
                     case 0:
                         where = [];
                         if (!this.repository.metadata.options.apiPrefilter) return [3 /*break*/, 3];
-                        if (!(typeof this.repository.metadata.options.apiPrefilter === "function")) return [3 /*break*/, 2];
+                        if (!(typeof this.repository.metadata.options.apiPrefilter === 'function')) return [3 /*break*/, 2];
                         _b = (_a = where).push;
                         return [4 /*yield*/, this.repository.metadata.options.apiPrefilter()];
                     case 1:
@@ -275,10 +273,10 @@ var DataApi = /** @class */ (function () {
                             where.push(filter_interfaces_1.buildFilterFromRequestParameters(this.repository.metadata, {
                                 get: function (key) {
                                     var result = request.get(key);
-                                    if (key.startsWith(filter_interfaces_1.customUrlToken) && result)
+                                    if (key.startsWith(filter_interfaces_1.customUrlToken) && result && typeof result === "string")
                                         return JSON.parse(result);
                                     return result;
-                                }
+                                },
                             }));
                         }
                         if (filterBody)
@@ -296,9 +294,11 @@ var DataApi = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         _c.trys.push([0, 5, , 6]);
-                        where = [this.repository.metadata.idMetadata.getIdFilter(id)];
+                        where = [
+                            this.repository.metadata.idMetadata.getIdFilter(id),
+                        ];
                         if (!this.repository.metadata.options.apiPrefilter) return [3 /*break*/, 3];
-                        if (!(typeof this.repository.metadata.options.apiPrefilter === "function")) return [3 /*break*/, 2];
+                        if (!(typeof this.repository.metadata.options.apiPrefilter === 'function')) return [3 /*break*/, 2];
                         _b = (_a = where).push;
                         return [4 /*yield*/, this.repository.metadata.options.apiPrefilter()];
                     case 1:
@@ -307,8 +307,9 @@ var DataApi = /** @class */ (function () {
                     case 2:
                         where.push(this.repository.metadata.options.apiPrefilter);
                         _c.label = 3;
-                    case 3: return [4 /*yield*/, this.repository.find({
-                            where: { $and: where }
+                    case 3: return [4 /*yield*/, this.repository
+                            .find({
+                            where: { $and: where },
                         })
                             .then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
@@ -319,7 +320,7 @@ var DataApi = /** @class */ (function () {
                                         return [3 /*break*/, 4];
                                     case 1:
                                         if (!(r.length > 1)) return [3 /*break*/, 2];
-                                        response.error({ message: "id is not unique" });
+                                        response.error({ message: 'id is not unique' });
                                         return [3 /*break*/, 4];
                                     case 2: return [4 /*yield*/, what(r[0])];
                                     case 3:
@@ -500,10 +501,10 @@ function determineSort(sortUrlParm, dirUrlParam) {
     var result = {};
     sortUrlParm.split(',').map(function (name, i) {
         var key = name.trim();
-        if (i < dirItems.length && dirItems[i].toLowerCase().trim().startsWith("d"))
-            return result[key] = "desc";
+        if (i < dirItems.length && dirItems[i].toLowerCase().trim().startsWith('d'))
+            return (result[key] = 'desc');
         else
-            return result[key] = "asc";
+            return (result[key] = 'asc');
     });
     return result;
 }
@@ -520,7 +521,3 @@ function serializeError(data) {
     return data;
 }
 exports.serializeError = serializeError;
-function getLiveQueryChannel(queryId, userId) {
-    return "users:" + userId + ":queries:" + queryId;
-}
-exports.getLiveQueryChannel = getLiveQueryChannel;

package/src/data-interfaces.d.ts

@@ -4,8 +4,8 @@ import { EntityMetadata, OmitEB } from './remult3';
 export interface DataProvider {
     getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
-    supportsRawFilter?: boolean;
     ensureSchema?(entities: EntityMetadata[]): Promise<void>;
+    isProxy?: boolean;
 }
 export interface Storage {
     ensureSchema(): Promise<void>;

package/src/data-providers/array-entity-data-provider.js

@@ -31,7 +31,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
         var _a;
         return _a = {},
             _a[filter_interfaces_1.customDatabaseFilterToken] = {
-                arrayFilter: filter
+                arrayFilter: filter,
             },
             _a;
     };
@@ -229,7 +229,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                     if (data[idf.key])
                         this.rows.forEach(function (i) {
                             if (data[idf.key] == i[idf.key])
-                                throw Error("id already exists");
+                                throw Error('id already exists');
                         });
                 }
                 j = this.translateToJson(data);

package/src/data-providers/in-memory-database.d.ts

@@ -1,5 +1,5 @@
 import { DataProvider, EntityDataProvider } from '../data-interfaces';
-import { __RowsOfDataForTesting } from "../__RowsOfDataForTesting";
+import { __RowsOfDataForTesting } from '../__RowsOfDataForTesting';
 import { EntityMetadata } from '../remult3';
 export declare class InMemoryDataProvider implements DataProvider, __RowsOfDataForTesting {
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;

package/src/data-providers/in-memory-database.js

@@ -25,7 +25,9 @@ var InMemoryDataProvider = /** @class */ (function () {
             this.rows[name] = [];
         return new array_entity_data_provider_1.ArrayEntityDataProvider(entity, this.rows[name]);
     };
-    InMemoryDataProvider.prototype.toString = function () { return "InMemoryDataProvider"; };
+    InMemoryDataProvider.prototype.toString = function () {
+        return 'InMemoryDataProvider';
+    };
     return InMemoryDataProvider;
 }());
 exports.InMemoryDataProvider = InMemoryDataProvider;

package/src/data-providers/json-data-provider.js

@@ -46,41 +46,59 @@ var JsonEntityDataProvider = /** @class */ (function () {
                         if (s)
                             data = JSON.parse(s);
                         dp = new array_entity_data_provider_1.ArrayEntityDataProvider(this.entity, data);
-                        return [2 /*return*/, what(dp, function () { return _this.helper.setItem(dbName, JSON.stringify(data, undefined, 2)); })];
+                        return [2 /*return*/, what(dp, function () {
+                                return _this.helper.setItem(dbName, JSON.stringify(data, undefined, 2));
+                            })];
                 }
             });
         });
     };
     JsonEntityDataProvider.prototype.find = function (options) {
         var _this = this;
-        return this.p = this.p.then(function () { return _this.loadEntityData(function (dp, save) { return dp.find(options); }); });
+        return (this.p = this.p.then(function () {
+            return _this.loadEntityData(function (dp, save) { return dp.find(options); });
+        }));
     };
     JsonEntityDataProvider.prototype.count = function (where) {
         var _this = this;
-        return this.p = this.p.then(function () { return _this.loadEntityData(function (dp, save) { return dp.count(where); }); });
+        return (this.p = this.p.then(function () {
+            return _this.loadEntityData(function (dp, save) { return dp.count(where); });
+        }));
     };
     JsonEntityDataProvider.prototype.update = function (id, data) {
         var _this = this;
-        return this.p = this.p.then(function () { return _this.loadEntityData(function (dp, save) { return dp.update(id, data).then(function (x) {
-            save();
-            return x;
-        }); }); });
+        return (this.p = this.p.then(function () {
+            return _this.loadEntityData(function (dp, save) {
+                return dp.update(id, data).then(function (x) {
+                    save();
+                    return x;
+                });
+            });
+        }));
     };
     JsonEntityDataProvider.prototype.delete = function (id) {
         var _this = this;
-        return this.p = this.p.then(function () { return _this.loadEntityData(function (dp, save) { return dp.delete(id).then(function (x) {
-            save();
-            return x;
-        }); }); });
+        return (this.p = this.p.then(function () {
+            return _this.loadEntityData(function (dp, save) {
+                return dp.delete(id).then(function (x) {
+                    save();
+                    return x;
+                });
+            });
+        }));
     };
     JsonEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.p = this.p.then(function () { return _this.loadEntityData(function (dp, save) { return dp.insert(data).then(function (x) {
-                        save();
-                        return x;
-                    }); }); })];
+                return [2 /*return*/, (this.p = this.p.then(function () {
+                        return _this.loadEntityData(function (dp, save) {
+                            return dp.insert(data).then(function (x) {
+                                save();
+                                return x;
+                            });
+                        });
+                    }))];
             });
         });
     };

package/src/data-providers/rest-data-provider.d.ts

@@ -8,7 +8,7 @@ export declare class RestDataProvider implements DataProvider {
     constructor(apiProvider: () => ApiClient);
     getEntityDataProvider(entity: EntityMetadata): RestEntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
-    supportsRawFilter: boolean;
+    isProxy: boolean;
 }
 export declare class RestEntityDataProvider implements EntityDataProvider {
     private url;