remult 0.18.1-exp.0 → 0.18.1-exp.2

package/esm/remult-express.d.ts

@@ -14,6 +14,7 @@ export declare class ServerEventsController implements ServerEventDispatcher {
     connections: clientConnection[];
     constructor(canUserConnectToChannel?: (channel: string, remult: Remult) => boolean);
     sendChannelMessage<T>(channel: string, message: any): void;
+    debugMessageFileSaver: (id: any, channel: any, message: any) => void;
     openHttpServerStream(req: import('express').Request, res: import('express').Response): clientConnection;
     debug(): void;
     debugFileSaver: (x: any) => void;

package/esm/remult-express.js

@@ -53,6 +53,7 @@ export class ServerEventsController {
     constructor(canUserConnectToChannel) {
         this.canUserConnectToChannel = canUserConnectToChannel;
         this.connections = [];
+        this.debugMessageFileSaver = (id, channel, message) => { };
         this.debugFileSaver = () => { };
         if (!this.canUserConnectToChannel) {
             this.canUserConnectToChannel = () => true;
@@ -83,6 +84,7 @@ export class ServerEventsController {
         const data = JSON.stringify({ channel, data: message });
         for (const sc of this.connections) {
             if (sc.channels[channel]) {
+                this.debugMessageFileSaver(sc.connectionId, channel, message);
                 sc.write(data);
             }
         }

package/esm/src/context.js

@@ -226,12 +226,9 @@ class transactionLiveQueryPublisher {
         }
     }
     flush() {
-        //TODO - figure out and resolve
-        setTimeout(() => {
-            for (const key of this.transactionItems.keys()) {
-                this.orig.itemChanged(key, this.transactionItems.get(key));
-            }
-        }, 100);
+        for (const key of this.transactionItems.keys()) {
+            this.orig.itemChanged(key, this.transactionItems.get(key));
+        }
     }
     sendChannelMessage(channel, message) {
         this.orig.sendChannelMessage(channel, message);

package/esm/src/data-providers/rest-data-provider.js

@@ -29,12 +29,17 @@ export function findOptionsToJson(options, meta) {
     };
 }
 export function findOptionsFromJson(json, meta) {
-    return {
-        limit: json.limit,
-        page: json.page,
-        where: Filter.entityFilterFromJson(meta, json.where),
-        orderBy: json.orderBy
-    };
+    let r = {};
+    for (const key of ["limit", "page", "where", "orderBy"]) {
+        if (json[key] !== undefined) {
+            if (key === "where") {
+                r[key] = Filter.entityFilterFromJson(meta, json.where);
+            }
+            else
+                r[key] = json[key];
+        }
+    }
+    return r;
 }
 export class RestEntityDataProvider {
     constructor(url, http, entity) {

package/esm/src/live-query/LiveQueryClient.js

@@ -72,7 +72,8 @@ export class LiveQueryClient {
                 q.subscribeCode = () => {
                     if (q.unsubscribe) {
                         q.unsubscribe();
-                        q.unsubscribe = undefined;
+                        //TODO - consider race scenario where unsubscribe is called before subscribe
+                        q.unsubscribe = () => { };
                     }
                     const thenResult = (r) => {
                         this.client.then(c => {

package/esm/src/live-query/LiveQueryPublisher.d.ts

@@ -25,12 +25,13 @@ export declare class LiveQueryStorageInMemoryImplementation implements LiveQuery
 export declare class LiveQueryPublisher implements LiveQueryPublisherInterface {
     dispatcher: ServerEventDispatcher;
     storage: LiveQueryStorage;
-    private performWithRequest;
+    performWithRequest: (serializedRequest: any, entityKey: string, what: (repo: Repository<any>) => Promise<void>) => Promise<void>;
     constructor(dispatcher: ServerEventDispatcher, storage: LiveQueryStorage, performWithRequest: (serializedRequest: any, entityKey: string, what: (repo: Repository<any>) => Promise<void>) => Promise<void>);
     stopLiveQuery(id: any): void;
     sendChannelMessage<messageType>(channel: string, message: messageType): void;
     defineLiveQueryChannel(serializeRequest: () => any, entityKey: string, findOptions: FindOptions<any>, ids: any[], userId: string, repo: Repository<any>): string;
     runPromise(p: Promise<any>): void;
+    debugFileSaver: (x: any) => void;
     itemChanged(entityKey: string, changes: itemChange[]): void;
 }
 export interface ServerEventDispatcher {

package/esm/src/live-query/LiveQueryPublisher.js

@@ -49,6 +49,7 @@ export class LiveQueryPublisher {
         this.dispatcher = dispatcher;
         this.storage = storage;
         this.performWithRequest = performWithRequest;
+        this.debugFileSaver = (x) => { };
     }
     stopLiveQuery(id) {
         this.storage.remove(id);
@@ -70,9 +71,10 @@ export class LiveQueryPublisher {
     runPromise(p) {
     }
     itemChanged(entityKey, changes) {
-        const messages = [];
+        //TODO - optimize so that the user will get their messages first. Based on user id
         this.runPromise(this.storage.provideListeners(entityKey, async ({ query, setLastIds }) => {
             await this.performWithRequest(query.requestJson, entityKey, async (repo) => {
+                const messages = [];
                 const currentItems = await repo.find(findOptionsFromJson(query.findOptionsJson, repo.metadata));
                 const currentIds = currentItems.map(x => repo.getEntityRef(x).getId());
                 for (const id of query.lastIds.filter(y => !currentIds.includes(y))) {
@@ -104,6 +106,13 @@ export class LiveQueryPublisher {
                         });
                     }
                 }
+                this.debugFileSaver({
+                    query: query.id,
+                    currentIds,
+                    changes,
+                    lastIds: query.lastIds,
+                    messages
+                });
                 await setLastIds(currentIds);
                 this.dispatcher.sendChannelMessage(query.id, messages);
             });

package/esm/src/live-query/LiveQuerySubscriber.js

@@ -83,6 +83,7 @@ export class MessageChannel {
     }
 }
 export const liveQueryKeepAliveRoute = '/_liveQueryKeepAlive';
+//TODO Yoni - keep in remult?
 export class AMessageChannel {
     constructor(channelKey) {
         this.channelKey = channelKey;

package/package.json

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

package/remult-express.d.ts

@@ -14,6 +14,7 @@ export declare class ServerEventsController implements ServerEventDispatcher {
     connections: clientConnection[];
     constructor(canUserConnectToChannel?: (channel: string, remult: Remult) => boolean);
     sendChannelMessage<T>(channel: string, message: any): void;
+    debugMessageFileSaver: (id: any, channel: any, message: any) => void;
     openHttpServerStream(req: import('express').Request, res: import('express').Response): clientConnection;
     debug(): void;
     debugFileSaver: (x: any) => void;

package/remult-express.js

@@ -126,6 +126,7 @@ var ServerEventsController = /** @class */ (function () {
     function ServerEventsController(canUserConnectToChannel) {
         this.canUserConnectToChannel = canUserConnectToChannel;
         this.connections = [];
+        this.debugMessageFileSaver = function (id, channel, message) { };
         this.debugFileSaver = function () { };
         if (!this.canUserConnectToChannel) {
             this.canUserConnectToChannel = function () { return true; };
@@ -172,6 +173,7 @@ var ServerEventsController = /** @class */ (function () {
             for (var _b = tslib_1.__values(this.connections), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var sc = _c.value;
                 if (sc.channels[channel]) {
+                    this.debugMessageFileSaver(sc.connectionId, channel, message);
                     sc.write(data);
                 }
             }

package/src/context.js

@@ -347,24 +347,20 @@ var transactionLiveQueryPublisher = /** @class */ (function () {
         }
     };
     transactionLiveQueryPublisher.prototype.flush = function () {
-        var _this = this;
-        //TODO - figure out and resolve
-        setTimeout(function () {
-            var e_5, _a;
-            try {
-                for (var _b = tslib_1.__values(_this.transactionItems.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var key = _c.value;
-                    _this.orig.itemChanged(key, _this.transactionItems.get(key));
-                }
+        var e_5, _a;
+        try {
+            for (var _b = tslib_1.__values(this.transactionItems.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var key = _c.value;
+                this.orig.itemChanged(key, this.transactionItems.get(key));
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_5) throw e_5.error; }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-        }, 100);
+            finally { if (e_5) throw e_5.error; }
+        }
     };
     transactionLiveQueryPublisher.prototype.sendChannelMessage = function (channel, message) {
         this.orig.sendChannelMessage(channel, message);

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

@@ -42,12 +42,28 @@ function findOptionsToJson(options, meta) {
 }
 exports.findOptionsToJson = findOptionsToJson;
 function findOptionsFromJson(json, meta) {
-    return {
-        limit: json.limit,
-        page: json.page,
-        where: filter_interfaces_1.Filter.entityFilterFromJson(meta, json.where),
-        orderBy: json.orderBy
-    };
+    var e_1, _a;
+    var r = {};
+    try {
+        for (var _b = tslib_1.__values(["limit", "page", "where", "orderBy"]), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var key = _c.value;
+            if (json[key] !== undefined) {
+                if (key === "where") {
+                    r[key] = filter_interfaces_1.Filter.entityFilterFromJson(meta, json.where);
+                }
+                else
+                    r[key] = json[key];
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return r;
 }
 exports.findOptionsFromJson = findOptionsFromJson;
 var RestEntityDataProvider = /** @class */ (function () {
@@ -57,7 +73,7 @@ var RestEntityDataProvider = /** @class */ (function () {
         this.entity = entity;
     }
     RestEntityDataProvider.prototype.translateFromJson = function (row) {
-        var e_1, _a;
+        var e_2, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -65,17 +81,17 @@ var RestEntityDataProvider = /** @class */ (function () {
                 result[col.key] = col.valueConverter.fromJson(row[col.key]);
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return result;
     };
     RestEntityDataProvider.prototype.translateToJson = function (row) {
-        var e_2, _a;
+        var e_3, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -83,12 +99,12 @@ var RestEntityDataProvider = /** @class */ (function () {
                 result[col.key] = col.valueConverter.toJson(row[col.key]);
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return result;
     };
@@ -153,7 +169,7 @@ var RestEntityDataProvider = /** @class */ (function () {
         return { filterObject: filterObject, url: url };
     };
     RestEntityDataProvider.prototype.update = function (id, data) {
-        var e_3, _a;
+        var e_4, _a;
         var _this = this;
         var result = {};
         var keys = Object.keys(data);
@@ -164,12 +180,12 @@ var RestEntityDataProvider = /** @class */ (function () {
                     result[col.key] = col.valueConverter.toJson(data[col.key]);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         return this.http().put(this.url() + '/' + encodeURIComponent(id), result).then(function (y) { return _this.translateFromJson(y); });
     };
@@ -228,7 +244,7 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
         });
     };
     RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
-        var e_4, _a;
+        var e_5, _a;
         var _this = this;
         var headers = {
             "Content-type": "application/json"
@@ -242,12 +258,12 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_5) throw e_5.error; }
             }
         return (this.fetch || fetch)(url, {
             credentials: 'include',

package/src/live-query/LiveQueryClient.js

@@ -79,7 +79,8 @@ var LiveQueryClient = /** @class */ (function () {
                 q.subscribeCode = function () {
                     if (q.unsubscribe) {
                         q.unsubscribe();
-                        q.unsubscribe = undefined;
+                        //TODO - consider race scenario where unsubscribe is called before subscribe
+                        q.unsubscribe = function () { };
                     }
                     var thenResult = function (r) {
                         _this.client.then(function (c) {

package/src/live-query/LiveQueryPublisher.d.ts

@@ -25,12 +25,13 @@ export declare class LiveQueryStorageInMemoryImplementation implements LiveQuery
 export declare class LiveQueryPublisher implements LiveQueryPublisherInterface {
     dispatcher: ServerEventDispatcher;
     storage: LiveQueryStorage;
-    private performWithRequest;
+    performWithRequest: (serializedRequest: any, entityKey: string, what: (repo: Repository<any>) => Promise<void>) => Promise<void>;
     constructor(dispatcher: ServerEventDispatcher, storage: LiveQueryStorage, performWithRequest: (serializedRequest: any, entityKey: string, what: (repo: Repository<any>) => Promise<void>) => Promise<void>);
     stopLiveQuery(id: any): void;
     sendChannelMessage<messageType>(channel: string, message: messageType): void;
     defineLiveQueryChannel(serializeRequest: () => any, entityKey: string, findOptions: FindOptions<any>, ids: any[], userId: string, repo: Repository<any>): string;
     runPromise(p: Promise<any>): void;
+    debugFileSaver: (x: any) => void;
     itemChanged(entityKey: string, changes: itemChange[]): void;
 }
 export interface ServerEventDispatcher {

package/src/live-query/LiveQueryPublisher.js

@@ -124,6 +124,7 @@ var LiveQueryPublisher = /** @class */ (function () {
         this.dispatcher = dispatcher;
         this.storage = storage;
         this.performWithRequest = performWithRequest;
+        this.debugFileSaver = function (x) { };
     }
     LiveQueryPublisher.prototype.stopLiveQuery = function (id) {
         this.storage.remove(id);
@@ -146,7 +147,7 @@ var LiveQueryPublisher = /** @class */ (function () {
     };
     LiveQueryPublisher.prototype.itemChanged = function (entityKey, changes) {
         var _this = this;
-        var messages = [];
+        //TODO - optimize so that the user will get their messages first. Based on user id
         this.runPromise(this.storage.provideListeners(entityKey, function (_a) {
             var query = _a.query, setLastIds = _a.setLastIds;
             return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -154,11 +155,13 @@ var LiveQueryPublisher = /** @class */ (function () {
                 return tslib_1.__generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, this.performWithRequest(query.requestJson, entityKey, function (repo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var currentItems, currentIds, _loop_3, _a, _b, id, _loop_4, currentItems_1, currentItems_1_1, item;
+                                var messages, currentItems, currentIds, _loop_3, _a, _b, id, _loop_4, currentItems_1, currentItems_1_1, item;
                                 var e_3, _c, e_4, _d;
                                 return tslib_1.__generator(this, function (_e) {
                                     switch (_e.label) {
-                                        case 0: return [4 /*yield*/, repo.find(rest_data_provider_1.findOptionsFromJson(query.findOptionsJson, repo.metadata))];
+                                        case 0:
+                                            messages = [];
+                                            return [4 /*yield*/, repo.find(rest_data_provider_1.findOptionsFromJson(query.findOptionsJson, repo.metadata))];
                                         case 1:
                                             currentItems = _e.sent();
                                             currentIds = currentItems.map(function (x) { return repo.getEntityRef(x).getId(); });
@@ -217,6 +220,13 @@ var LiveQueryPublisher = /** @class */ (function () {
                                                 }
                                                 finally { if (e_4) throw e_4.error; }
                                             }
+                                            this.debugFileSaver({
+                                                query: query.id,
+                                                currentIds: currentIds,
+                                                changes: changes,
+                                                lastIds: query.lastIds,
+                                                messages: messages
+                                            });
                                             return [4 /*yield*/, setLastIds(currentIds)];
                                         case 2:
                                             _e.sent();

package/src/live-query/LiveQuerySubscriber.js

@@ -183,6 +183,7 @@ var MessageChannel = /** @class */ (function () {
 }());
 exports.MessageChannel = MessageChannel;
 exports.liveQueryKeepAliveRoute = '/_liveQueryKeepAlive';
+//TODO Yoni - keep in remult?
 var AMessageChannel = /** @class */ (function () {
     function AMessageChannel(channelKey) {
         this.channelKey = channelKey;