remult 0.17.0-exp.1 → 0.17.0-exp.2

package/esm/remult-express.js

@@ -1,7 +1,7 @@
 import * as express from 'express';
 import { createRemultServer } from './server/expressBridge';
 import { streamUrl } from './src/live-query/LiveQuery';
-import { LiveQueryManager } from './src/live-query/LiveQueryManager';
+import { LiveQueryPublisher } from './src/live-query/LiveQueryManager';
 import { remult } from './src/remult-proxy';
 export function remultExpress(options) {
     let app = express.Router();
@@ -18,7 +18,7 @@ export function remultExpress(options) {
     const server = createRemultServer(options);
     server.registerRouter(app);
     let httpServerEvents = new ServerEventsController(options.messageChannels);
-    server.liveQueryManager = new LiveQueryManager(httpServerEvents);
+    server.liveQueryManager = new LiveQueryPublisher(httpServerEvents);
     const streamPath = options.rootPath + '/' + streamUrl;
     app.get(streamPath, (req, res) => {
         httpServerEvents.openHttpServerStream(req, res);

package/esm/server/expressBridge.d.ts

@@ -5,7 +5,7 @@ import { AllowedForInstance, Remult, UserInfo } from '../src/context';
 import { ClassType } from '../classType';
 import { Repository } from '../src/remult3';
 import { IdEntity } from '../src/id-entity';
-import { LiveQueryManager } from '../src/live-query/LiveQueryManager';
+import { LiveQueryPublisher } from '../src/live-query/LiveQueryManager';
 export interface RemultServerOptions<RequestType extends GenericRequest> {
     /** Sets a database connection for Remult.
      *
@@ -64,7 +64,7 @@ export declare class RemultServerImplementation implements RemultServer {
     options: RemultServerOptions<GenericRequest>;
     dataProvider: DataProvider | Promise<DataProvider>;
     constructor(queue: inProcessQueueHandler, options: RemultServerOptions<GenericRequest>, dataProvider: DataProvider | Promise<DataProvider>);
-    liveQueryManager: LiveQueryManager;
+    liveQueryManager: LiveQueryPublisher;
     withRemult<T>(req: GenericRequest, res: GenericResponse, next: VoidFunction): void;
     routeImpl: RouteImplementation;
     handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse>;

package/esm/server/initAsyncHooks.js

@@ -2,7 +2,6 @@ import { AsyncLocalStorage } from 'async_hooks';
 import { RemultAsyncLocalStorage } from './expressBridge';
 let init = false;
 export function initAsyncHooks() {
-    return;
     if (init)
         return;
     init = true;

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

@@ -3,8 +3,8 @@ import { streamUrl } from "./LiveQuery";
 export class EventSourceLiveQueryProvider {
     constructor(wrapMessage) {
         this.wrapMessage = wrapMessage;
-        if (!wrapMessage)
-            wrapMessage = x => x();
+        if (!this.wrapMessage)
+            this.wrapMessage = x => x();
     }
     openStreamAndReturnCloseFunction(clientId, onMessage) {
         const source = new EventSource(remult.apiClient.url + '/' + streamUrl + "?id=" + clientId, {

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

@@ -23,7 +23,6 @@ export declare class LiveQueryClient {
     subscribe<entityType>(repo: Repository<entityType>, options: FindOptions<entityType>, onResult: (reducer: (prevState: entityType[]) => entityType[]) => void): () => void;
     closeListener: Promise<VoidFunction>;
     private openIfNoOpened;
-    private openListener;
 }
 export declare type listener = (message: any) => void;
 export interface SubscribeToQueryArgs<entityType = any> {

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

@@ -1,13 +1,14 @@
-import { getEntityRef, remult as defaultRemult, Sort } from '../../index';
+import { remult as defaultRemult, Sort } from '../../index';
 import { v4 as uuid } from 'uuid';
 import { RestEntityDataProvider } from '../data-providers/rest-data-provider';
 import { buildRestDataProvider } from '../context';
+import { getId } from '../remult3/getId';
 export const streamUrl = 'stream1';
 class LiveQueryOnFrontEnd {
     constructor(repo, query) {
         this.repo = repo;
         this.query = query;
-        this.items = [];
+        this.defaultQueryState = [];
         this.listeners = [];
     }
     async setAllItems(result) {
@@ -19,6 +20,7 @@ class LiveQueryOnFrontEnd {
         });
     }
     forListeners(what) {
+        //   what(x => this.defaultQueryState = x(this.defaultQueryState));
         for (const l of this.listeners) {
             what(l);
         }
@@ -41,7 +43,7 @@ class LiveQueryOnFrontEnd {
                     listener(items => {
                         if (!items)
                             items = [];
-                        return sort(items.map(x => this.repo.getEntityRef(x).getId() === message.data.oldId ? item : x));
+                        return sort(items.map(x => getId(this.repo.metadata, x) === message.data.oldId ? item : x));
                     });
                 });
                 break;
@@ -61,7 +63,7 @@ class LiveQueryOnFrontEnd {
                 this.forListeners(listener => listener(items => {
                     if (!items)
                         items = [];
-                    return this.items.filter(x => getEntityRef(x).getId() !== message.data.id);
+                    return items.filter(x => getId(this.repo.metadata, x) !== message.data.id);
                 }));
                 break;
         }
@@ -130,7 +132,7 @@ export class LiveQueryClient {
     subscribe(repo, options, onResult) {
         let alive = true;
         let onUnsubscribe = () => { };
-        this.runPromise(this.openListener().then(() => repo.buildEntityDataProviderFindOptions(options)
+        this.runPromise(this.openIfNoOpened().then(() => repo.buildEntityDataProviderFindOptions(options)
             .then(opts => {
             if (!alive)
                 return;
@@ -152,7 +154,7 @@ export class LiveQueryClient {
                     this.runPromise(this.provider.get(url.url).then(thenResult));
             }
             else {
-                onResult(x => q.items);
+                onResult(x => [...q.defaultQueryState]);
             }
             q.listeners.push(onResult);
             onUnsubscribe = () => {
@@ -173,23 +175,18 @@ export class LiveQueryClient {
             this.provider = buildRestDataProvider(defaultRemult.apiClient.httpClient);
         }
         if (!this.closeListener)
-            return this.openListener();
-        return this.closeListener;
-    }
-    openListener() {
-        if (this.closeListener)
-            return this.closeListener;
-        return this.runPromise(this.closeListener = this.lqp.openStreamAndReturnCloseFunction(this.clientId, message => {
-            for (const q of this.queries.values()) {
-                if (q.id === message.event) {
-                    this.runPromise(q.handle(message.data));
+            return this.runPromise(this.closeListener = this.lqp.openStreamAndReturnCloseFunction(this.clientId, message => {
+                for (const q of this.queries.values()) {
+                    if (q.id === message.event) {
+                        this.runPromise(q.handle(message.data));
+                    }
                 }
-            }
-            const channel = this.channels.get(message.event);
-            if (channel) {
-                channel.handle(message.data);
-            }
-        }));
+                const channel = this.channels.get(message.event);
+                if (channel) {
+                    channel.handle(message.data);
+                }
+            }));
+        return this.closeListener;
     }
 }
 export class AMessageChannel {

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

@@ -2,12 +2,11 @@ import { Remult } from '../..';
 import { Repository, EntityRef, FindOptions } from '../remult3';
 import { LiveQueryProvider } from '../data-api';
 import { liveQueryMessage } from './LiveQuery';
-export declare class LiveQueryManager implements LiveQueryProvider {
+export declare class LiveQueryPublisher implements LiveQueryProvider {
     private dispatcher;
     constructor(dispatcher: ServerEventDispatcher);
     subscribe(repo: Repository<any>, clientId: string, findOptions: FindOptions<any>, remult: Remult, ids: any[]): string;
     clients: clientInfo[];
-    sendMessage(key: string, message: liveQueryMessage): void;
     hasListeners(ref: EntityRef<any>): boolean;
     runPromise(p: Promise<any>): void;
     saved(ref: EntityRef<any>): void;

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

@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid';
-export class LiveQueryManager {
+export class LiveQueryPublisher {
     constructor(dispatcher) {
         this.dispatcher = dispatcher;
         this.clients = [];
@@ -19,15 +19,6 @@ export class LiveQueryManager {
         });
         return id;
     }
-    sendMessage(key, message) {
-        for (const c of this.clients) {
-            for (const q of c.queries) {
-                if (q.repo.metadata.key === key) {
-                    this.dispatcher.sendQueryMessage({ clientId: c.clientId, queryId: q.id, message });
-                }
-            }
-        }
-    }
     hasListeners(ref) {
         for (const c of this.clients) {
             for (const q of c.queries) {
@@ -87,11 +78,22 @@ export class LiveQueryManager {
         }
     }
     deleted(ref) {
-        if (!this.hasListeners(ref))
-            return;
-        this.sendMessage(ref.metadata.key, {
-            type: "remove",
-            data: { id: ref.getId() }
-        });
+        const id = ref.getOriginalId();
+        for (const c of this.clients) {
+            for (const q of c.queries) {
+                if (q.repo.metadata.key === ref.metadata.key) {
+                    if (q.ids.includes(id)) {
+                        this.dispatcher.sendQueryMessage({
+                            clientId: c.clientId, queryId: q.id, message: {
+                                type: "remove",
+                                data: {
+                                    id: id
+                                }
+                            }
+                        });
+                    }
+                }
+            }
+        }
     }
 }

package/esm/src/remult3/RepositoryImplementation.js

@@ -7,6 +7,7 @@ import { ValueConverters } from "../valueConverters";
 import { filterHelper } from "../filter/filter-interfaces";
 import { assign } from "../../assign";
 import { remult as defaultRemult } from "../remult-proxy";
+import { getId } from "./getId";
 //import { remult } from "../remult-proxy";
 let classValidatorValidate = undefined;
 // import("class-validator".toString())
@@ -166,8 +167,10 @@ export class RepositoryImplementation {
                 instance[field.key] = entity[field.key];
             }
             let row = new rowHelperImplementation(this._info, instance, this, this.edp, this.remult, false);
-            if (id)
+            if (id) {
                 row.id = id;
+                row.originalId = id;
+            }
             else
                 row.id = row.getId();
             ref = row;
@@ -719,10 +722,7 @@ export class rowHelperImplementation extends rowHelperBase {
     get apiDeleteAllowed() { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiDelete); }
     get apiInsertAllowed() { return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiInsert); }
     getId() {
-        if (this.info.idMetadata.field instanceof CompoundIdField)
-            return this.info.idMetadata.field.getId(this.instance);
-        else
-            return this.instance[this.info.idMetadata.field.key];
+        return getId(this.info, this.instance);
     }
     saveMoreOriginalData() {
         this.originalId = this.getId();
@@ -874,11 +874,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 this.instance[col.key] = data[col.key];
         }
         await this.calcServerExpression();
-        if (this.repository.metadata.idMetadata.field instanceof CompoundIdField) {
-            this.id = this.repository.metadata.idMetadata.field.getId(this.instance);
-        }
-        else
-            this.id = data[this.repository.metadata.idMetadata.field.key];
+        this.id = getId(this.info, this.instance);
     }
     getOriginalId() {
         return this.originalId;

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

@@ -0,0 +1,2 @@
+import type { EntityMetadata } from "./remult3";
+export declare function getId<entityType>(meta: EntityMetadata<entityType>, instance: entityType): any;

package/esm/src/remult3/getId.js

@@ -0,0 +1,7 @@
+import { CompoundIdField } from '../column';
+export function getId(meta, instance) {
+    if (meta.idMetadata.field instanceof CompoundIdField)
+        return meta.idMetadata.field.getId(instance);
+    else
+        return instance[meta.idMetadata.field.key];
+}

package/esm/src/tests/testHelper.spec.d.ts

@@ -1,5 +1,6 @@
 import './frontend-database-tests-setup.spec';
 import { Remult } from "../context";
+import { DataApi } from "../data-api";
 import { DataProvider, EntityDataProvider } from "../data-interfaces";
 import { InMemoryDataProvider } from "../data-providers/in-memory-database";
 import { EntityMetadata } from "../remult3";
@@ -32,3 +33,4 @@ export declare class MockRestDataProvider implements DataProvider {
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     supportsCustomFilter: boolean;
 }
+export declare function createMockHttpDataProvider(dataApi: DataApi<any>): import("c:/Repos/radweb/projects/core/src/data-interfaces").RestDataProviderHttpProvider;

package/esm/src/tests/testHelper.spec.js

@@ -158,65 +158,68 @@ export class MockRestDataProvider {
     }
     getEntityDataProvider(metadata) {
         let dataApi = new DataApi(this.remult.repo(metadata.entityType), this.remult);
-        return new RestEntityDataProvider(() => "", () => new HttpProviderBridgeToRestDataProviderHttpProvider({
-            delete: async (url) => {
-                let urlSplit = url.split('/');
-                let r = new TestDataApiResponse();
-                let result;
-                r.deleted = () => { };
-                try {
-                    testConfiguration.restDbRunningOnServer = true;
-                    await dataApi.delete(r, urlSplit[urlSplit.length - 1]);
-                }
-                finally {
-                    testConfiguration.restDbRunningOnServer = false;
-                }
-                return result;
-            },
-            get: async (url) => {
-                let r = new TestDataApiResponse();
-                let result;
-                r.success = data => { result = data; };
-                try {
-                    testConfiguration.restDbRunningOnServer = true;
-                    await dataApi.httpGet(r, urlToReq(url));
-                }
-                finally {
-                    testConfiguration.restDbRunningOnServer = false;
-                }
-                return result;
-            },
-            post: async (url, data) => {
-                let r = new TestDataApiResponse();
-                let result;
-                r.created = data => { result = data; };
-                r.success = data => { result = data; };
-                try {
-                    testConfiguration.restDbRunningOnServer = true;
-                    await dataApi.httpPost(r, urlToReq(url), data);
-                }
-                finally {
-                    testConfiguration.restDbRunningOnServer = false;
-                }
-                return result;
-            },
-            put: async (url, data) => {
-                let urlSplit = url.split('/');
-                let r = new TestDataApiResponse();
-                let result;
-                r.success = data => { result = data; };
-                try {
-                    testConfiguration.restDbRunningOnServer = true;
-                    await dataApi.put(r, urlSplit[urlSplit.length - 1], data);
-                }
-                finally {
-                    testConfiguration.restDbRunningOnServer = false;
-                }
-                return result;
-            }
-        }), metadata);
+        return new RestEntityDataProvider(() => "", () => createMockHttpDataProvider(dataApi), metadata);
     }
     transaction(action) {
         throw new Error('Method not implemented.');
     }
 }
+export function createMockHttpDataProvider(dataApi) {
+    return new HttpProviderBridgeToRestDataProviderHttpProvider({
+        delete: async (url) => {
+            let urlSplit = url.split('/');
+            let r = new TestDataApiResponse();
+            let result;
+            r.deleted = () => { };
+            try {
+                testConfiguration.restDbRunningOnServer = true;
+                await dataApi.delete(r, urlSplit[urlSplit.length - 1]);
+            }
+            finally {
+                testConfiguration.restDbRunningOnServer = false;
+            }
+            return result;
+        },
+        get: async (url) => {
+            let r = new TestDataApiResponse();
+            let result;
+            r.success = data => { result = data; };
+            try {
+                testConfiguration.restDbRunningOnServer = true;
+                await dataApi.httpGet(r, urlToReq(url));
+            }
+            finally {
+                testConfiguration.restDbRunningOnServer = false;
+            }
+            return result;
+        },
+        post: async (url, data) => {
+            let r = new TestDataApiResponse();
+            let result;
+            r.created = data => { result = data; };
+            r.success = data => { result = data; };
+            try {
+                testConfiguration.restDbRunningOnServer = true;
+                await dataApi.httpPost(r, urlToReq(url), data);
+            }
+            finally {
+                testConfiguration.restDbRunningOnServer = false;
+            }
+            return result;
+        },
+        put: async (url, data) => {
+            let urlSplit = url.split('/');
+            let r = new TestDataApiResponse();
+            let result;
+            r.success = data => { result = data; };
+            try {
+                testConfiguration.restDbRunningOnServer = true;
+                await dataApi.put(r, urlSplit[urlSplit.length - 1], data);
+            }
+            finally {
+                testConfiguration.restDbRunningOnServer = false;
+            }
+            return result;
+        }
+    });
+}

package/package.json

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

package/remult-express.js

@@ -22,7 +22,7 @@ function remultExpress(options) {
     var server = expressBridge_1.createRemultServer(options);
     server.registerRouter(app);
     var httpServerEvents = new ServerEventsController(options.messageChannels);
-    server.liveQueryManager = new LiveQueryManager_1.LiveQueryManager(httpServerEvents);
+    server.liveQueryManager = new LiveQueryManager_1.LiveQueryPublisher(httpServerEvents);
     var streamPath = options.rootPath + '/' + LiveQuery_1.streamUrl;
     app.get(streamPath, function (req, res) {
         httpServerEvents.openHttpServerStream(req, res);

package/server/expressBridge.d.ts

@@ -5,7 +5,7 @@ import { AllowedForInstance, Remult, UserInfo } from '../src/context';
 import { ClassType } from '../classType';
 import { Repository } from '../src/remult3';
 import { IdEntity } from '../src/id-entity';
-import { LiveQueryManager } from '../src/live-query/LiveQueryManager';
+import { LiveQueryPublisher } from '../src/live-query/LiveQueryManager';
 export interface RemultServerOptions<RequestType extends GenericRequest> {
     /** Sets a database connection for Remult.
      *
@@ -64,7 +64,7 @@ export declare class RemultServerImplementation implements RemultServer {
     options: RemultServerOptions<GenericRequest>;
     dataProvider: DataProvider | Promise<DataProvider>;
     constructor(queue: inProcessQueueHandler, options: RemultServerOptions<GenericRequest>, dataProvider: DataProvider | Promise<DataProvider>);
-    liveQueryManager: LiveQueryManager;
+    liveQueryManager: LiveQueryPublisher;
     withRemult<T>(req: GenericRequest, res: GenericResponse, next: VoidFunction): void;
     routeImpl: RouteImplementation;
     handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse>;

package/server/initAsyncHooks.js

@@ -5,7 +5,6 @@ var async_hooks_1 = require("async_hooks");
 var expressBridge_1 = require("./expressBridge");
 var init = false;
 function initAsyncHooks() {
-    return;
     if (init)
         return;
     init = true;

package/src/live-query/EventSourceLiveQueryProvider.js

@@ -6,8 +6,8 @@ var LiveQuery_1 = require("./LiveQuery");
 var EventSourceLiveQueryProvider = /** @class */ (function () {
     function EventSourceLiveQueryProvider(wrapMessage) {
         this.wrapMessage = wrapMessage;
-        if (!wrapMessage)
-            wrapMessage = function (x) { return x(); };
+        if (!this.wrapMessage)
+            this.wrapMessage = function (x) { return x(); };
     }
     EventSourceLiveQueryProvider.prototype.openStreamAndReturnCloseFunction = function (clientId, onMessage) {
         var _this = this;

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

@@ -23,7 +23,6 @@ export declare class LiveQueryClient {
     subscribe<entityType>(repo: Repository<entityType>, options: FindOptions<entityType>, onResult: (reducer: (prevState: entityType[]) => entityType[]) => void): () => void;
     closeListener: Promise<VoidFunction>;
     private openIfNoOpened;
-    private openListener;
 }
 export declare type listener = (message: any) => void;
 export interface SubscribeToQueryArgs<entityType = any> {

package/src/live-query/LiveQuery.js

@@ -6,12 +6,13 @@ var index_1 = require("../../index");
 var uuid_1 = require("uuid");
 var rest_data_provider_1 = require("../data-providers/rest-data-provider");
 var context_1 = require("../context");
+var getId_1 = require("../remult3/getId");
 exports.streamUrl = 'stream1';
 var LiveQueryOnFrontEnd = /** @class */ (function () {
     function LiveQueryOnFrontEnd(repo, query) {
         this.repo = repo;
         this.query = query;
-        this.items = [];
+        this.defaultQueryState = [];
         this.listeners = [];
     }
     LiveQueryOnFrontEnd.prototype.setAllItems = function (result) {
@@ -36,6 +37,7 @@ var LiveQueryOnFrontEnd = /** @class */ (function () {
     LiveQueryOnFrontEnd.prototype.forListeners = function (what) {
         var e_1, _a;
         try {
+            //   what(x => this.defaultQueryState = x(this.defaultQueryState));
             for (var _b = tslib_1.__values(this.listeners), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var l = _c.value;
                 what(l);
@@ -81,7 +83,7 @@ var LiveQueryOnFrontEnd = /** @class */ (function () {
                             listener(function (items) {
                                 if (!items)
                                     items = [];
-                                return sort(items.map(function (x) { return _this.repo.getEntityRef(x).getId() === message.data.oldId ? item_1 : x; }));
+                                return sort(items.map(function (x) { return getId_1.getId(_this.repo.metadata, x) === message.data.oldId ? item_1 : x; }));
                             });
                         });
                         return [3 /*break*/, 7];
@@ -102,7 +104,7 @@ var LiveQueryOnFrontEnd = /** @class */ (function () {
                             return listener(function (items) {
                                 if (!items)
                                     items = [];
-                                return _this.items.filter(function (x) { return index_1.getEntityRef(x).getId() !== message.data.id; });
+                                return items.filter(function (x) { return getId_1.getId(_this.repo.metadata, x) !== message.data.id; });
                             });
                         });
                         return [3 /*break*/, 7];
@@ -197,7 +199,7 @@ var LiveQueryClient = /** @class */ (function () {
         var _this = this;
         var alive = true;
         var onUnsubscribe = function () { };
-        this.runPromise(this.openListener().then(function () { return repo.buildEntityDataProviderFindOptions(options)
+        this.runPromise(this.openIfNoOpened().then(function () { return repo.buildEntityDataProviderFindOptions(options)
             .then(function (opts) {
             if (!alive)
                 return;
@@ -219,7 +221,7 @@ var LiveQueryClient = /** @class */ (function () {
                     _this.runPromise(_this.provider.get(url.url).then(thenResult));
             }
             else {
-                onResult(function (x) { return q.items; });
+                onResult(function (x) { return tslib_1.__spread(q.defaultQueryState); });
             }
             q.listeners.push(onResult);
             onUnsubscribe = function () {
@@ -236,39 +238,34 @@ var LiveQueryClient = /** @class */ (function () {
         };
     };
     LiveQueryClient.prototype.openIfNoOpened = function () {
+        var _this = this;
         if (!this.provider) {
             this.provider = context_1.buildRestDataProvider(index_1.remult.apiClient.httpClient);
         }
         if (!this.closeListener)
-            return this.openListener();
-        return this.closeListener;
-    };
-    LiveQueryClient.prototype.openListener = function () {
-        var _this = this;
-        if (this.closeListener)
-            return this.closeListener;
-        return this.runPromise(this.closeListener = this.lqp.openStreamAndReturnCloseFunction(this.clientId, function (message) {
-            var e_3, _a;
-            try {
-                for (var _b = tslib_1.__values(_this.queries.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var q = _c.value;
-                    if (q.id === message.event) {
-                        _this.runPromise(q.handle(message.data));
+            return this.runPromise(this.closeListener = this.lqp.openStreamAndReturnCloseFunction(this.clientId, function (message) {
+                var e_3, _a;
+                try {
+                    for (var _b = tslib_1.__values(_this.queries.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var q = _c.value;
+                        if (q.id === message.event) {
+                            _this.runPromise(q.handle(message.data));
+                        }
                     }
                 }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                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_3) throw e_3.error; }
                 }
-                finally { if (e_3) throw e_3.error; }
-            }
-            var channel = _this.channels.get(message.event);
-            if (channel) {
-                channel.handle(message.data);
-            }
-        }));
+                var channel = _this.channels.get(message.event);
+                if (channel) {
+                    channel.handle(message.data);
+                }
+            }));
+        return this.closeListener;
     };
     return LiveQueryClient;
 }());

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

@@ -2,12 +2,11 @@ import { Remult } from '../..';
 import { Repository, EntityRef, FindOptions } from '../remult3';
 import { LiveQueryProvider } from '../data-api';
 import { liveQueryMessage } from './LiveQuery';
-export declare class LiveQueryManager implements LiveQueryProvider {
+export declare class LiveQueryPublisher implements LiveQueryProvider {
     private dispatcher;
     constructor(dispatcher: ServerEventDispatcher);
     subscribe(repo: Repository<any>, clientId: string, findOptions: FindOptions<any>, remult: Remult, ids: any[]): string;
     clients: clientInfo[];
-    sendMessage(key: string, message: liveQueryMessage): void;
     hasListeners(ref: EntityRef<any>): boolean;
     runPromise(p: Promise<any>): void;
     saved(ref: EntityRef<any>): void;

package/src/live-query/LiveQueryManager.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiveQueryManager = void 0;
+exports.LiveQueryPublisher = void 0;
 var tslib_1 = require("tslib");
 var uuid_1 = require("uuid");
-var LiveQueryManager = /** @class */ (function () {
-    function LiveQueryManager(dispatcher) {
+var LiveQueryPublisher = /** @class */ (function () {
+    function LiveQueryPublisher(dispatcher) {
         this.dispatcher = dispatcher;
         this.clients = [];
     }
-    LiveQueryManager.prototype.subscribe = function (repo, clientId, findOptions, remult, ids) {
+    LiveQueryPublisher.prototype.subscribe = function (repo, clientId, findOptions, remult, ids) {
         var client = this.clients.find(function (c) { return c.clientId === clientId; });
         if (!client) {
             this.clients.push(client = { clientId: clientId, queries: [] });
@@ -23,7 +23,7 @@ var LiveQueryManager = /** @class */ (function () {
         });
         return id;
     };
-    LiveQueryManager.prototype.sendMessage = function (key, message) {
+    LiveQueryPublisher.prototype.hasListeners = function (ref) {
         var e_1, _a, e_2, _b;
         try {
             for (var _c = tslib_1.__values(this.clients), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -31,9 +31,8 @@ var LiveQueryManager = /** @class */ (function () {
                 try {
                     for (var _e = (e_2 = void 0, tslib_1.__values(c.queries)), _f = _e.next(); !_f.done; _f = _e.next()) {
                         var q = _f.value;
-                        if (q.repo.metadata.key === key) {
-                            this.dispatcher.sendQueryMessage({ clientId: c.clientId, queryId: q.id, message: message });
-                        }
+                        if (q.repo.metadata.key === ref.metadata.key)
+                            return true;
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -52,51 +51,22 @@ var LiveQueryManager = /** @class */ (function () {
             }
             finally { if (e_1) throw e_1.error; }
         }
-    };
-    LiveQueryManager.prototype.hasListeners = function (ref) {
-        var e_3, _a, e_4, _b;
-        try {
-            for (var _c = tslib_1.__values(this.clients), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var c = _d.value;
-                try {
-                    for (var _e = (e_4 = void 0, tslib_1.__values(c.queries)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                        var q = _f.value;
-                        if (q.repo.metadata.key === ref.metadata.key)
-                            return true;
-                    }
-                }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                finally {
-                    try {
-                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                    }
-                    finally { if (e_4) throw e_4.error; }
-                }
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
         return false;
     };
-    LiveQueryManager.prototype.runPromise = function (p) {
+    LiveQueryPublisher.prototype.runPromise = function (p) {
     };
     //TODO - reconsider usage of zone
-    LiveQueryManager.prototype.saved = function (ref) {
-        var e_5, _a;
+    LiveQueryPublisher.prototype.saved = function (ref) {
+        var e_3, _a;
         var _this = this;
         var isNew = ref.isNew();
         var origId = isNew ? ref.getId() : ref.getOriginalId();
         var _loop_1 = function (c) {
-            var e_6, _a;
+            var e_4, _a;
             var _loop_2 = function (q) {
                 if (q.repo.metadata.key === ref.metadata.key) {
                     this_1.runPromise(q.repo.find(q.findOptions).then(function (currentItems) {
-                        var e_7, _a, e_8, _b;
+                        var e_5, _a, e_6, _b;
                         var currentIds = currentItems.map(function (x) { return q.repo.getEntityRef(x).getId(); });
                         var sendMessage = function (message) {
                             console.log({ message: message.type });
@@ -104,7 +74,7 @@ var LiveQueryManager = /** @class */ (function () {
                         };
                         console.log({ ids: q.ids, currentIds: currentIds });
                         try {
-                            for (var _c = (e_7 = void 0, tslib_1.__values(q.ids.filter(function (y) { return !currentIds.includes(y); }))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            for (var _c = (e_5 = void 0, tslib_1.__values(q.ids.filter(function (y) { return !currentIds.includes(y); }))), _d = _c.next(); !_d.done; _d = _c.next()) {
                                 var id = _d.value;
                                 if (id != origId || !currentIds.includes(ref.getId()))
                                     sendMessage({
@@ -115,15 +85,15 @@ var LiveQueryManager = /** @class */ (function () {
                                     });
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         try {
-                            for (var currentItems_1 = (e_8 = void 0, tslib_1.__values(currentItems)), currentItems_1_1 = currentItems_1.next(); !currentItems_1_1.done; currentItems_1_1 = currentItems_1.next()) {
+                            for (var currentItems_1 = (e_6 = void 0, tslib_1.__values(currentItems)), currentItems_1_1 = currentItems_1.next(); !currentItems_1_1.done; currentItems_1_1 = currentItems_1.next()) {
                                 var item = currentItems_1_1.value;
                                 var itemRef = q.repo.getEntityRef(item);
                                 if (itemRef.getId() == ref.getId() && q.ids.includes(origId)) {
@@ -143,29 +113,29 @@ var LiveQueryManager = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
                                 if (currentItems_1_1 && !currentItems_1_1.done && (_b = currentItems_1.return)) _b.call(currentItems_1);
                             }
-                            finally { if (e_8) throw e_8.error; }
+                            finally { if (e_6) throw e_6.error; }
                         }
                         q.ids = currentIds;
                     }));
                 }
             };
             try {
-                for (var _b = (e_6 = void 0, tslib_1.__values(c.queries)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_4 = void 0, tslib_1.__values(c.queries)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var q = _c.value;
                     _loop_2(q);
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_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_6) throw e_6.error; }
+                finally { if (e_4) throw e_4.error; }
             }
         };
         var this_1 = this;
@@ -175,22 +145,54 @@ var LiveQueryManager = /** @class */ (function () {
                 _loop_1(c);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_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_5) throw e_5.error; }
+            finally { if (e_3) throw e_3.error; }
         }
     };
-    LiveQueryManager.prototype.deleted = function (ref) {
-        if (!this.hasListeners(ref))
-            return;
-        this.sendMessage(ref.metadata.key, {
-            type: "remove",
-            data: { id: ref.getId() }
-        });
+    LiveQueryPublisher.prototype.deleted = function (ref) {
+        var e_7, _a, e_8, _b;
+        var id = ref.getOriginalId();
+        try {
+            for (var _c = tslib_1.__values(this.clients), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var c = _d.value;
+                try {
+                    for (var _e = (e_8 = void 0, tslib_1.__values(c.queries)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        var q = _f.value;
+                        if (q.repo.metadata.key === ref.metadata.key) {
+                            if (q.ids.includes(id)) {
+                                this.dispatcher.sendQueryMessage({
+                                    clientId: c.clientId, queryId: q.id, message: {
+                                        type: "remove",
+                                        data: {
+                                            id: id
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                finally {
+                    try {
+                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                    }
+                    finally { if (e_8) throw e_8.error; }
+                }
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
     };
-    return LiveQueryManager;
+    return LiveQueryPublisher;
 }());
-exports.LiveQueryManager = LiveQueryManager;
+exports.LiveQueryPublisher = LiveQueryPublisher;

package/src/remult3/RepositoryImplementation.js

@@ -11,6 +11,7 @@ var valueConverters_1 = require("../valueConverters");
 var filter_interfaces_2 = require("../filter/filter-interfaces");
 var assign_1 = require("../../assign");
 var remult_proxy_1 = require("../remult-proxy");
+var getId_1 = require("./getId");
 //import { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import("class-validator".toString())
@@ -282,8 +283,10 @@ var RepositoryImplementation = /** @class */ (function () {
                 finally { if (e_5) throw e_5.error; }
             }
             var row_1 = new rowHelperImplementation(this._info, instance, this, this.edp, this.remult, false);
-            if (id)
+            if (id) {
                 row_1.id = id;
+                row_1.originalId = id;
+            }
             else
                 row_1.id = row_1.getId();
             ref = row_1;
@@ -1218,10 +1221,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.getId = function () {
-        if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
-            return this.info.idMetadata.field.getId(this.instance);
-        else
-            return this.instance[this.info.idMetadata.field.key];
+        return getId_1.getId(this.info, this.instance);
     };
     rowHelperImplementation.prototype.saveMoreOriginalData = function () {
         this.originalId = this.getId();
@@ -1551,11 +1551,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
                         _d.sent();
-                        if (this.repository.metadata.idMetadata.field instanceof column_1.CompoundIdField) {
-                            this.id = this.repository.metadata.idMetadata.field.getId(this.instance);
-                        }
-                        else
-                            this.id = data[this.repository.metadata.idMetadata.field.key];
+                        this.id = getId_1.getId(this.info, this.instance);
                         return [2 /*return*/];
                 }
             });

package/src/remult3/getId.d.ts

@@ -0,0 +1,2 @@
+import type { EntityMetadata } from "./remult3";
+export declare function getId<entityType>(meta: EntityMetadata<entityType>, instance: entityType): any;

package/src/remult3/getId.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getId = void 0;
+var column_1 = require("../column");
+function getId(meta, instance) {
+    if (meta.idMetadata.field instanceof column_1.CompoundIdField)
+        return meta.idMetadata.field.getId(instance);
+    else
+        return instance[meta.idMetadata.field.key];
+}
+exports.getId = getId;

package/src/tests/testHelper.spec.d.ts

@@ -1,5 +1,6 @@
 import './frontend-database-tests-setup.spec';
 import { Remult } from "../context";
+import { DataApi } from "../data-api";
 import { DataProvider, EntityDataProvider } from "../data-interfaces";
 import { InMemoryDataProvider } from "../data-providers/in-memory-database";
 import { EntityMetadata } from "../remult3";
@@ -32,3 +33,4 @@ export declare class MockRestDataProvider implements DataProvider {
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     supportsCustomFilter: boolean;
 }
+export declare function createMockHttpDataProvider(dataApi: DataApi<any>): import("c:/Repos/radweb/projects/core/src/data-interfaces").RestDataProviderHttpProvider;

package/src/tests/testHelper.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockRestDataProvider = exports.testAllDataProviders = exports.testRestDb = exports.testInMemoryDb = exports.testSql = exports.ActionTestConfig = exports.testAsIfOnBackend = exports.fitForEach = exports.itForEach = void 0;
+exports.createMockHttpDataProvider = exports.MockRestDataProvider = exports.testAllDataProviders = exports.testRestDb = exports.testInMemoryDb = exports.testSql = exports.ActionTestConfig = exports.testAsIfOnBackend = exports.fitForEach = exports.itForEach = void 0;
 var tslib_1 = require("tslib");
 require("./frontend-database-tests-setup.spec");
 var context_1 = require("../context");
@@ -270,101 +270,8 @@ var MockRestDataProvider = /** @class */ (function () {
         this.supportsCustomFilter = true;
     }
     MockRestDataProvider.prototype.getEntityDataProvider = function (metadata) {
-        var _this = this;
         var dataApi = new data_api_1.DataApi(this.remult.repo(metadata.entityType), this.remult);
-        return new rest_data_provider_1.RestEntityDataProvider(function () { return ""; }, function () { return new context_1.HttpProviderBridgeToRestDataProviderHttpProvider({
-            delete: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var urlSplit, r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            urlSplit = url.split('/');
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.deleted = function () { };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.delete(r, urlSplit[urlSplit.length - 1])];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            get: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.httpGet(r, urlToReq(url))];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            post: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.created = function (data) { result = data; };
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.httpPost(r, urlToReq(url), data)];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); },
-            put: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var urlSplit, r, result;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            urlSplit = url.split('/');
-                            r = new TestDataApiResponse_1.TestDataApiResponse();
-                            r.success = function (data) { result = data; };
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 3, 4]);
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
-                            return [4 /*yield*/, dataApi.put(r, urlSplit[urlSplit.length - 1], data)];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
-                            return [7 /*endfinally*/];
-                        case 4: return [2 /*return*/, result];
-                    }
-                });
-            }); }
-        }); }, metadata);
+        return new rest_data_provider_1.RestEntityDataProvider(function () { return ""; }, function () { return createMockHttpDataProvider(dataApi); }, metadata);
     };
     MockRestDataProvider.prototype.transaction = function (action) {
         throw new Error('Method not implemented.');
@@ -372,3 +279,100 @@ var MockRestDataProvider = /** @class */ (function () {
     return MockRestDataProvider;
 }());
 exports.MockRestDataProvider = MockRestDataProvider;
+function createMockHttpDataProvider(dataApi) {
+    var _this = this;
+    return new context_1.HttpProviderBridgeToRestDataProviderHttpProvider({
+        delete: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var urlSplit, r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        urlSplit = url.split('/');
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.deleted = function () { };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.delete(r, urlSplit[urlSplit.length - 1])];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        get: function (url) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.httpGet(r, urlToReq(url))];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        post: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.created = function (data) { result = data; };
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.httpPost(r, urlToReq(url), data)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); },
+        put: function (url, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var urlSplit, r, result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        urlSplit = url.split('/');
+                        r = new TestDataApiResponse_1.TestDataApiResponse();
+                        r.success = function (data) { result = data; };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = true;
+                        return [4 /*yield*/, dataApi.put(r, urlSplit[urlSplit.length - 1], data)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        entityWithValidations_1.testConfiguration.restDbRunningOnServer = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        }); }
+    });
+}
+exports.createMockHttpDataProvider = createMockHttpDataProvider;