remult 0.18.1-exp.1 → 0.18.1-exp.2

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/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,6 +71,7 @@ export class LiveQueryPublisher {
     runPromise(p) {
     }
     itemChanged(entityKey, changes) {
+        //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 = [];
@@ -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.1",
+    "version": "0.18.1-exp.2",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

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/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,6 +147,7 @@ var LiveQueryPublisher = /** @class */ (function () {
     };
     LiveQueryPublisher.prototype.itemChanged = function (entityKey, changes) {
         var _this = this;
+        //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 () {
@@ -218,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;