remult 0.26.10 → 0.26.11-next.1

package/esm/internals.js

@@ -4,3 +4,4 @@ export { decorateColumnSettings, controllerRefImpl, getControllerRef, } from './
 export { getEntitySettings } from './src/remult3/getEntityRef.js';
 export { __updateEntityBasedOnWhere } from './src/filter/filter-interfaces.js';
 export const actionInfo = remultStatic.actionInfo;
+export { flags } from './src/remult3/remult3.js';

package/esm/postgres/postgres-data-provider.js

@@ -163,11 +163,11 @@ export async function createPostgresDataProvider(options) {
 export async function preparePostgresQueueStorage(sql) {
     let c = new Remult();
     c.dataProvider = sql;
-    let JobsInQueueEntity = (await import('../server/expressBridge.js'))
+    let JobsInQueueEntity = (await import('../server/remult-api-server.js'))
         .JobsInQueueEntity;
     let e = c.repo(JobsInQueueEntity);
     await sql.ensureSchema([e.metadata]);
-    return new (await import('../server/expressBridge.js')).EntityQueueStorage(c.repo(JobsInQueueEntity));
+    return new (await import('../server/remult-api-server.js')).EntityQueueStorage(c.repo(JobsInQueueEntity));
 }
 export class PostgresSchemaWrapper {
     pool;

package/esm/remult-fresh.js

@@ -1,4 +1,4 @@
-import { createRemultServerCore } from './server/expressBridge.js';
+import { createRemultServerCore } from './server/remult-api-server.js';
 export function remultFresh(options, response) {
     const server = createRemultServerCore(options, {
         buildGenericRequestInfo: (r) => r,

package/esm/remult-sqlite-core.js

@@ -22,7 +22,7 @@ export class SqliteCoreDataProvider {
                 builder.addSql(await self.getCreateTableSql(entity));
             },
             addColumn: async (entity, field) => {
-                let e = await dbNamesOf(entity);
+                let e = await dbNamesOf(entity, this.wrapIdentifier);
                 let sql = `alter table ${e.$entityName} add column ${self.addColumnSqlSyntax(field, e.$dbNameOf(field))}`;
                 builder.addSql(sql);
             },
@@ -46,7 +46,7 @@ export class SqliteCoreDataProvider {
         }
     }
     async dropTable(entity) {
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, this.wrapIdentifier);
         let sql = 'drop  table if exists ' + e.$entityName;
         if (SqlDatabase.LogToConsole)
             console.info(sql);
@@ -78,7 +78,7 @@ export class SqliteCoreDataProvider {
     supportsJsonColumnType;
     async getCreateTableSql(entity) {
         let result = '';
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, this.wrapIdentifier);
         for (const x of entity.fields) {
             if (!shouldNotCreateField(x, e) || isAutoIncrement(x)) {
                 if (result.length != 0)
@@ -101,6 +101,7 @@ export class SqliteCoreDataProvider {
         return sql;
     }
     wrapIdentifier(name) {
-        return name;
+        //return name
+        return '`' + name + '`';
     }
 }

package/esm/server/core.js

@@ -1,4 +1,4 @@
-export { createRemultServerCore, } from './expressBridge.js';
+export { createRemultServerCore, } from './remult-api-server.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';

package/esm/server/index.js

@@ -1,4 +1,4 @@
-import { createRemultServerCore } from './expressBridge.js';
+import { createRemultServerCore } from './remult-api-server.js';
 import { initAsyncHooks } from './initAsyncHooks.js';
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';

package/esm/src/buildRestDataProvider.js

@@ -1,4 +1,5 @@
 import { RestDataProviderHttpProviderUsingFetch } from './data-providers/rest-data-provider.js';
+import { flags } from './remult3/remult3.js';
 export function buildRestDataProvider(provider) {
     if (!provider)
         return new RestDataProviderHttpProviderUsingFetch();
@@ -51,11 +52,11 @@ export async function retry(what) {
                 err.message?.includes('http proxy error') ||
                 err.message?.startsWith('Gateway Timeout') ||
                 err.status == 500) &&
-                i++ < 50) {
+                i++ < flags.error500RetryCount) {
                 await new Promise((res, req) => {
                     setTimeout(() => {
                         res({});
-                    }, 250);
+                    }, 500);
                 });
                 continue;
             }

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

@@ -134,7 +134,7 @@ export class ArrayEntityDataProvider {
                 return Promise.resolve(this.translateFromJson(this.rows()[i], names));
             }
         }
-        throw new Error("couldn't find id to update: " + id);
+        throw new Error(`ArrayEntityDataProvider: Couldn't find row with id "${id}" in entity "${this.entity.key}" to update`);
     }
     async delete(id) {
         const names = await this.init();
@@ -145,7 +145,7 @@ export class ArrayEntityDataProvider {
                 return Promise.resolve();
             }
         }
-        throw new Error("couldn't find id to delete: " + id);
+        throw new Error(`ArrayEntityDataProvider: Couldn't find row with id "${id}" in entity "${this.entity.key}" to delete`);
     }
     async insert(data) {
         const names = await this.init();

package/esm/src/data-providers/sql-database.js

@@ -100,7 +100,7 @@ export class SqlDatabase {
             },
         };
     }
-    static async filterToRaw(repo, condition, sqlCommand, dbNames, wrapIdentifier = (x) => x) {
+    static async filterToRaw(repo, condition, sqlCommand, dbNames, wrapIdentifier) {
         if (!sqlCommand) {
             sqlCommand = new myDummySQLCommand();
         }

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

@@ -67,7 +67,7 @@ export class LiveQueryClient {
             onUnsubscribe = () => { };
         };
     }
-    closeIfNoListeners() {
+    _actuallyClose() {
         if (this.client)
             if (this.queries.size === 0 && this.channels.size === 0) {
                 this.runPromise(this.client.then((x) => x.close()));
@@ -76,6 +76,12 @@ export class LiveQueryClient {
                 this.interval = undefined;
             }
     }
+    keepAliveMs = 1000;
+    closeIfNoListeners() {
+        setTimeout(() => {
+            this._actuallyClose();
+        }, this.keepAliveMs);
+    }
     subscribe(repo, options, listener) {
         let alive = true;
         let onUnsubscribe = () => {
@@ -162,7 +168,8 @@ export class LiveQueryClient {
             this.interval = setInterval(async () => {
                 const ids = [];
                 for (const q of this.queries.values()) {
-                    ids.push(q.queryChannel);
+                    if (q.gotAnyResult)
+                        ids.push(q.queryChannel);
                 }
                 if (ids.length > 0) {
                     let p = this.apiProvider();

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

@@ -1,6 +1,7 @@
 import { buildRestDataProvider } from '../buildRestDataProvider.js';
 import { remult } from '../remult-proxy.js';
 import { remultStatic } from '../remult-static.js';
+import { flags } from '../remult3/remult3.js';
 import { streamUrl } from './SubscriptionChannel.js';
 export class SseSubscriptionClient {
     openConnection(onReconnect) {
@@ -34,6 +35,7 @@ export class SseSubscriptionClient {
         };
         const createConnectionPromise = () => new Promise((res) => {
             createConnection();
+            let retryCount = 0;
             function createConnection() {
                 if (source)
                     source.close();
@@ -47,9 +49,11 @@ export class SseSubscriptionClient {
                 source.onerror = (e) => {
                     console.error('Live Query Event Source Error', e);
                     source.close();
-                    setTimeout(() => {
-                        createConnection();
-                    }, 500);
+                    if (retryCount++ < flags.error500RetryCount) {
+                        setTimeout(() => {
+                            createConnection();
+                        }, 500);
+                    }
                 };
                 source.addEventListener('connectionId', async (e) => {
                     //@ts-ignore

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

@@ -10,10 +10,12 @@ export class LiveQuerySubscriber {
     sendDefaultState(onResult) {
         onResult(this.createReducerType(() => [...this.defaultQueryState], this.allItemsMessage(this.defaultQueryState)));
     }
+    gotAnyResult = false;
     queryChannel;
     subscribeCode;
     unsubscribe = () => { };
     async setAllItems(result) {
+        this.gotAnyResult = true;
         const items = await getRepositoryInternals(this.repo)._fromJsonArray(result, this.query.options);
         this.forListeners((listener) => {
             listener(() => {

package/esm/src/remult3/RepositoryImplementation.js

@@ -226,7 +226,7 @@ export class RepositoryImplementation {
                     refs.push(ref);
                     raw.push(await ref.buildDtoForInsert());
                 }
-                return Promise.all((await this._edp.insertMany(raw)).map((item, i) => refs[i].processInsertResponseDto(item)));
+                return promiseAll(await this._edp.insertMany(raw), (item, i) => refs[i].processInsertResponseDto(item));
             }
             else {
                 let r = [];
@@ -354,7 +354,7 @@ export class RepositoryImplementation {
     }
     async save(entity) {
         if (Array.isArray(entity)) {
-            return Promise.all(entity.map((x) => this.save(x)));
+            return promiseAll(entity, (x) => this.save(x));
         }
         else {
             let ref = getEntityRef(entity, false);
@@ -476,7 +476,7 @@ export class RepositoryImplementation {
                 repo._addToCache(r);
             }
         }
-        let result = await Promise.all(rawRows.map(async (r) => await this._mapRawDataToResult(r, loadFields)));
+        let result = await promiseAll(rawRows, async (r) => await this._mapRawDataToResult(r, loadFields));
         for (const col of this.metadata.fields) {
             let rel = getRelationFieldInfo(col);
             let incl = col.options
@@ -972,7 +972,7 @@ class rowHelperBase {
     }
     lookups = new Map();
     async waitLoad() {
-        await Promise.all([...this.lookups.values()].map((x) => x.waitLoad()));
+        await promiseAll([...this.lookups.values()], (x) => x.waitLoad());
     }
     errors;
     __assertValidity() {
@@ -1144,7 +1144,7 @@ class rowHelperBase {
                     }
                 }
         }
-        await Promise.all([...this.fields].map((x) => x.load()));
+        await promiseAll([...this.fields].filter((f) => !getRelationFieldInfo(f.metadata)), (x) => x.load());
     }
 }
 export class rowHelperImplementation extends rowHelperBase {
@@ -2398,3 +2398,11 @@ export function getRepository(entity) {
     }
     return entity;
 }
+async function promiseAll(array, mapToPromise) {
+    const result = [];
+    for (let index = 0; index < array.length; index++) {
+        const element = array[index];
+        result.push(await mapToPromise(element, index));
+    }
+    return result;
+}

package/esm/src/remult3/remult3.js

@@ -1,8 +1,12 @@
-export {};
+export const flags = {
+    error500RetryCount: 4,
+};
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
-//y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
-//y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
-//y2 - readonly key: keyof MembersOnly<entityType> & string
+//y1 - live query with count #436
+//y1 - live query errort that appears in tests but I can't understand why - `open connection error `
+//y1 TODO - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+//y1 TODO - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
+//y1 TODO -  readonly key: keyof MembersOnly<entityType> & string
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -22,14 +26,12 @@ export {};
 //p1 - wait a second to close stream
 //p1 - prepare the createEntity discussion
 //p1 - return error on connection error
-//p1 - reconsider key typing to be keyof & string
 //p1 - article on displayValue including it's definition for entities that is used in relations
+//p1 - article auth.js with express - played with it, requires type="module" and a few more configurations - https://github.com/noam-honig/express-auth
 //p2 -fix remult admin not to load the html into memory until used
-//y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
 //p2 - create foreign key constraints in user code - https://codesandbox.io/p/devbox/fk-validator-tdshcs
 //p2 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string} also checkout the admin* as it should probably be something else and didn't work in hono
-//p1 - article auth.js with express - played with it, requires type="module" and a few more configurations - https://github.com/noam-honig/express-auth
 //y2 - fix validators cache
 //y2 - should we validate relations
 //y1 - dependency of live query tables  live query refresh of view on table update
@@ -79,7 +81,6 @@ export {};
 //p1 - when a tasks table exists in a different schema - we get many errors
 //p1 - live query with include
 //p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
-//p2 - when subscribe is forbidden - the query still runs after the renew process
 //p2 - 'update tasks set  where id = $1
 //p2 - type metadata.key - to keyof entity - based on cwis input
 //y2 - remove __dirname from tutorials

package/internals.d.ts

@@ -12,3 +12,4 @@ export declare const actionInfo: {
     };
 };
 export { ClassType } from './classType.js';
+export { flags } from './src/remult3/remult3.js';

package/internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actionInfo = exports.__updateEntityBasedOnWhere = exports.getEntitySettings = exports.getControllerRef = exports.controllerRefImpl = exports.decorateColumnSettings = exports.getRelationFieldInfo = exports.getRelationInfo = void 0;
+exports.flags = exports.actionInfo = exports.__updateEntityBasedOnWhere = exports.getEntitySettings = exports.getControllerRef = exports.controllerRefImpl = exports.decorateColumnSettings = exports.getRelationFieldInfo = exports.getRelationInfo = void 0;
 var remult_static_js_1 = require("./src/remult-static.js");
 var relationInfoMember_js_1 = require("./src/remult3/relationInfoMember.js");
 Object.defineProperty(exports, "getRelationInfo", { enumerable: true, get: function () { return relationInfoMember_js_1.getRelationInfo; } });
@@ -14,3 +14,5 @@ Object.defineProperty(exports, "getEntitySettings", { enumerable: true, get: fun
 var filter_interfaces_js_1 = require("./src/filter/filter-interfaces.js");
 Object.defineProperty(exports, "__updateEntityBasedOnWhere", { enumerable: true, get: function () { return filter_interfaces_js_1.__updateEntityBasedOnWhere; } });
 exports.actionInfo = remult_static_js_1.remultStatic.actionInfo;
+var remult3_js_1 = require("./src/remult3/remult3.js");
+Object.defineProperty(exports, "flags", { enumerable: true, get: function () { return remult3_js_1.flags; } });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.10",
+    "version": "0.26.11-next.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/postgres/postgres-data-provider.d.ts

@@ -45,7 +45,7 @@ export declare function createPostgresDataProvider(options?: {
     schema?: string;
     orderByNullsFirst?: boolean;
 }): Promise<SqlDatabase>;
-export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge.js").EntityQueueStorage>;
+export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/remult-api-server.js").EntityQueueStorage>;
 export declare class PostgresSchemaWrapper implements PostgresPool {
     private pool;
     private schema;

package/postgres/postgres-data-provider.js

@@ -248,7 +248,7 @@ function preparePostgresQueueStorage(sql) {
                 case 0:
                     c = new context_js_1.Remult();
                     c.dataProvider = sql;
-                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('../server/expressBridge.js')); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('../server/remult-api-server.js')); })];
                 case 1:
                     JobsInQueueEntity = (_a.sent())
                         .JobsInQueueEntity;
@@ -256,7 +256,7 @@ function preparePostgresQueueStorage(sql) {
                     return [4 /*yield*/, sql.ensureSchema([e.metadata])];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('../server/expressBridge.js')); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('../server/remult-api-server.js')); })];
                 case 3: return [2 /*return*/, new (_a.sent()).EntityQueueStorage(c.repo(JobsInQueueEntity))];
             }
         });

package/remult-express.d.ts

@@ -1,5 +1,5 @@
 import * as express from 'express';
-import type { RemultServer, RemultServerCore, RemultServerOptions } from './server/expressBridge.js';
+import type { RemultServer, RemultServerCore, RemultServerOptions } from './server/remult-api-server.js';
 export declare function remultExpress(options?: RemultServerOptions<express.Request> & {
     bodyParser?: boolean;
     bodySizeLimit?: string;

package/remult-fastify.d.ts

@@ -1,5 +1,5 @@
 import type { FastifyPluginCallback, FastifyRequest } from 'fastify';
-import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/expressBridge.js';
+import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/remult-api-server.js';
 export declare function remultFastify(options: RemultServerOptions<FastifyRequest>): RemultFastifyServer;
 export type RemultFastifyServer = FastifyPluginCallback & RemultServerCore<FastifyRequest> & {
     withRemult: RemultServer<FastifyRequest>['withRemultAsync'];

package/remult-fresh.d.ts

@@ -1,4 +1,4 @@
-import type { RemultServerCore, RemultServerOptions } from './server/expressBridge.js';
+import type { RemultServerCore, RemultServerOptions } from './server/remult-api-server.js';
 export declare function remultFresh(options: RemultServerOptions<FreshRequest>, response: FreshResponse): RemultFresh;
 export interface RemultFresh extends RemultServerCore<FreshRequest> {
     handle(req: FreshRequest, ctx: FreshContext): Promise<any>;

package/remult-fresh.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remultFresh = void 0;
 var tslib_1 = require("tslib");
-var expressBridge_js_1 = require("./server/expressBridge.js");
+var remult_api_server_js_1 = require("./server/remult-api-server.js");
 function remultFresh(options, response) {
     var _this = this;
-    var server = (0, expressBridge_js_1.createRemultServerCore)(options, {
+    var server = (0, remult_api_server_js_1.createRemultServerCore)(options, {
         buildGenericRequestInfo: function (r) { return r; },
         getRequestBody: function (req) { return req.json(); },
     });

package/remult-sqlite-core.d.ts

@@ -18,5 +18,5 @@ export declare class SqliteCoreDataProvider implements SqlImplementation, CanBui
     createTableIfNotExist(entity: EntityMetadata<any>): Promise<void>;
     supportsJsonColumnType?: boolean;
     private getCreateTableSql;
-    wrapIdentifier?(name: string): string;
+    wrapIdentifier(name: string): string;
 }

package/remult-sqlite-core.js

@@ -36,7 +36,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
                 var e, sql;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                        case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, this.wrapIdentifier)];
                         case 1:
                             e = _a.sent();
                             sql = "alter table ".concat(e.$entityName, " add column ").concat(self.addColumnSqlSyntax(field, e.$dbNameOf(field)));
@@ -117,7 +117,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
             var e, sql;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, this.wrapIdentifier)];
                     case 1:
                         e = _a.sent();
                         sql = 'drop  table if exists ' + e.$entityName;
@@ -174,7 +174,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         result = '';
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, this.wrapIdentifier)];
                     case 1:
                         e = _d.sent();
                         try {
@@ -212,7 +212,8 @@ var SqliteCoreDataProvider = /** @class */ (function () {
         });
     };
     SqliteCoreDataProvider.prototype.wrapIdentifier = function (name) {
-        return name;
+        //return name
+        return '`' + name + '`';
     };
     return SqliteCoreDataProvider;
 }());

package/server/core.d.ts

@@ -1,4 +1,4 @@
-export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer, } from './expressBridge.js';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer, } from './remult-api-server.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';

package/server/core.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataProviderLiveQueryStorage = exports.SseSubscriptionServer = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.createRemultServerCore = void 0;
-var expressBridge_js_1 = require("./expressBridge.js");
-Object.defineProperty(exports, "createRemultServerCore", { enumerable: true, get: function () { return expressBridge_js_1.createRemultServerCore; } });
+var remult_api_server_js_1 = require("./remult-api-server.js");
+Object.defineProperty(exports, "createRemultServerCore", { enumerable: true, get: function () { return remult_api_server_js_1.createRemultServerCore; } });
 var JsonEntityFileStorage_js_1 = require("./JsonEntityFileStorage.js");
 Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get: function () { return JsonEntityFileStorage_js_1.JsonEntityFileStorage; } });
 Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_js_1.JsonFileDataProvider; } });

package/server/index.d.ts

@@ -1,6 +1,6 @@
-import type { RemultServer, RemultServerOptions, ServerCoreOptions } from './expressBridge.js';
+import type { RemultServer, RemultServerOptions, ServerCoreOptions } from './remult-api-server.js';
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
-export { GenericRequestHandler, GenericRequestInfo, GenericResponse, GenericRouter, InitRequestOptions, QueueStorage, RemultServer, RemultServerCore, RemultServerOptions, SpecificRoute, queuedJobInfo, } from './expressBridge.js';
+export { GenericRequestHandler, GenericRequestInfo, GenericResponse, GenericRouter, InitRequestOptions, QueueStorage, RemultServer, RemultServerCore, RemultServerOptions, SpecificRoute, queuedJobInfo, } from './remult-api-server.js';
 export declare function createRemultServer<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions?: ServerCoreOptions<RequestType>): RemultServer<RequestType>;

package/server/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRemultServer = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.DataProviderLiveQueryStorage = exports.SseSubscriptionServer = void 0;
 var tslib_1 = require("tslib");
-var expressBridge_js_1 = require("./expressBridge.js");
+var remult_api_server_js_1 = require("./remult-api-server.js");
 var initAsyncHooks_js_1 = require("./initAsyncHooks.js");
 var SseSubscriptionServer_js_1 = require("../SseSubscriptionServer.js");
 Object.defineProperty(exports, "SseSubscriptionServer", { enumerable: true, get: function () { return SseSubscriptionServer_js_1.SseSubscriptionServer; } });
@@ -14,7 +14,7 @@ Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get:
 function createRemultServer(options, serverCoreOptions) {
     var _this = this;
     (0, initAsyncHooks_js_1.initAsyncHooks)();
-    return (0, expressBridge_js_1.createRemultServerCore)(options, serverCoreOptions || {
+    return (0, remult_api_server_js_1.createRemultServerCore)(options, serverCoreOptions || {
         buildGenericRequestInfo: function (req) { return req; },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];

package/src/buildRestDataProvider.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processHttpException = exports.toPromise = exports.retry = exports.HttpProviderBridgeToRestDataProviderHttpProvider = exports.isExternalHttpProvider = exports.buildRestDataProvider = void 0;
 var tslib_1 = require("tslib");
 var rest_data_provider_js_1 = require("./data-providers/rest-data-provider.js");
+var remult3_js_1 = require("./remult3/remult3.js");
 function buildRestDataProvider(provider) {
     if (!provider)
         return new rest_data_provider_js_1.RestDataProviderHttpProviderUsingFetch();
@@ -85,11 +86,11 @@ function retry(what) {
                         ((_c = err_1.message) === null || _c === void 0 ? void 0 : _c.includes('http proxy error')) ||
                         ((_d = err_1.message) === null || _d === void 0 ? void 0 : _d.startsWith('Gateway Timeout')) ||
                         err_1.status == 500) &&
-                        i++ < 50)) return [3 /*break*/, 6];
+                        i++ < remult3_js_1.flags.error500RetryCount)) return [3 /*break*/, 6];
                     return [4 /*yield*/, new Promise(function (res, req) {
                             setTimeout(function () {
                                 res({});
-                            }, 250);
+                            }, 500);
                         })];
                 case 5:
                     _e.sent();

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

@@ -229,7 +229,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                                 return [2 /*return*/, Promise.resolve(this.translateFromJson(this.rows()[i], names))];
                             }
                         }
-                        throw new Error("couldn't find id to update: " + id);
+                        throw new Error("ArrayEntityDataProvider: Couldn't find row with id \"".concat(id, "\" in entity \"").concat(this.entity.key, "\" to update"));
                 }
             });
         });
@@ -249,7 +249,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                                 return [2 /*return*/, Promise.resolve()];
                             }
                         }
-                        throw new Error("couldn't find id to delete: " + id);
+                        throw new Error("ArrayEntityDataProvider: Couldn't find row with id \"".concat(id, "\" in entity \"").concat(this.entity.key, "\" to delete"));
                 }
             });
         });

package/src/data-providers/sql-database.js

@@ -167,7 +167,6 @@ var SqlDatabase = /** @class */ (function () {
             _a;
     };
     SqlDatabase.filterToRaw = function (repo, condition, sqlCommand, dbNames, wrapIdentifier) {
-        if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r, b, _a, _b, _c;
             return tslib_1.__generator(this, function (_d) {

package/src/live-query/LiveQueryClient.js

@@ -14,6 +14,7 @@ var LiveQueryClient = /** @class */ (function () {
         this.getUserId = getUserId;
         this.queries = new Map();
         this.channels = new Map();
+        this.keepAliveMs = 1000;
     }
     LiveQueryClient.prototype.wrapMessageHandling = function (handleMessage) {
         var x = this.apiProvider().wrapMessageHandling;
@@ -87,7 +88,7 @@ var LiveQueryClient = /** @class */ (function () {
             });
         });
     };
-    LiveQueryClient.prototype.closeIfNoListeners = function () {
+    LiveQueryClient.prototype._actuallyClose = function () {
         if (this.client)
             if (this.queries.size === 0 && this.channels.size === 0) {
                 this.runPromise(this.client.then(function (x) { return x.close(); }));
@@ -96,6 +97,12 @@ var LiveQueryClient = /** @class */ (function () {
                 this.interval = undefined;
             }
     };
+    LiveQueryClient.prototype.closeIfNoListeners = function () {
+        var _this = this;
+        setTimeout(function () {
+            _this._actuallyClose();
+        }, this.keepAliveMs);
+    };
     LiveQueryClient.prototype.subscribe = function (repo, options, listener) {
         var _this = this;
         var alive = true;
@@ -189,7 +196,8 @@ var LiveQueryClient = /** @class */ (function () {
                             try {
                                 for (_a = tslib_1.__values(this.queries.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     q = _b.value;
-                                    ids.push(q.queryChannel);
+                                    if (q.gotAnyResult)
+                                        ids.push(q.queryChannel);
                                 }
                             }
                             catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/src/live-query/SseSubscriptionClient.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var buildRestDataProvider_js_1 = require("../buildRestDataProvider.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
 var remult_static_js_1 = require("../remult-static.js");
+var remult3_js_1 = require("../remult3/remult3.js");
 var SubscriptionChannel_js_1 = require("./SubscriptionChannel.js");
 var SseSubscriptionClient = /** @class */ (function () {
     function SseSubscriptionClient() {
@@ -54,6 +55,7 @@ var SseSubscriptionClient = /** @class */ (function () {
         var createConnectionPromise = function () {
             return new Promise(function (res) {
                 createConnection();
+                var retryCount = 0;
                 function createConnection() {
                     var _this = this;
                     if (source)
@@ -68,9 +70,11 @@ var SseSubscriptionClient = /** @class */ (function () {
                     source.onerror = function (e) {
                         console.error('Live Query Event Source Error', e);
                         source.close();
-                        setTimeout(function () {
-                            createConnection();
-                        }, 500);
+                        if (retryCount++ < remult3_js_1.flags.error500RetryCount) {
+                            setTimeout(function () {
+                                createConnection();
+                            }, 500);
+                        }
                     };
                     source.addEventListener('connectionId', function (e) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var _a, _b, channel, e_1_1;

package/src/live-query/SubscriptionChannel.js

@@ -12,6 +12,7 @@ var LiveQuerySubscriber = /** @class */ (function () {
     function LiveQuerySubscriber(repo, query, userId) {
         this.repo = repo;
         this.query = query;
+        this.gotAnyResult = false;
         this.unsubscribe = function () { };
         this.defaultQueryState = [];
         this.listeners = [];
@@ -28,7 +29,9 @@ var LiveQuerySubscriber = /** @class */ (function () {
             var items;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(this.repo)._fromJsonArray(result, this.query.options)];
+                    case 0:
+                        this.gotAnyResult = true;
+                        return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(this.repo)._fromJsonArray(result, this.query.options)];
                     case 1:
                         items = _a.sent();
                         this.forListeners(function (listener) {

package/src/remult3/RepositoryImplementation.js

@@ -280,20 +280,20 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.insert = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_4_1, _c, _d, r, entity_2, entity_2_1, item, _e, _f, e_5_1, ref;
-            var e_4, _g, e_5, _h;
-            return tslib_1.__generator(this, function (_j) {
-                switch (_j.label) {
+            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_4_1, _c, r, entity_2, entity_2_1, item, _d, _e, e_5_1, ref;
+            var e_4, _f, e_5, _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 23];
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 13];
                         refs_1 = [];
                         raw = [];
-                        _j.label = 1;
+                        _h.label = 1;
                     case 1:
-                        _j.trys.push([1, 9, 10, 11]);
+                        _h.trys.push([1, 9, 10, 11]);
                         entity_1 = tslib_1.__values(entity), entity_1_1 = entity_1.next();
-                        _j.label = 2;
+                        _h.label = 2;
                     case 2:
                         if (!!entity_1_1.done) return [3 /*break*/, 8];
                         item = entity_1_1.value;
@@ -304,59 +304,59 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 3: return [4 /*yield*/, this.getEntityRef(this.create(item))];
                     case 4:
-                        ref = (_j.sent());
-                        _j.label = 5;
+                        ref = (_h.sent());
+                        _h.label = 5;
                     case 5:
                         refs_1.push(ref);
                         _b = (_a = raw).push;
                         return [4 /*yield*/, ref.buildDtoForInsert()];
                     case 6:
-                        _b.apply(_a, [_j.sent()]);
-                        _j.label = 7;
+                        _b.apply(_a, [_h.sent()]);
+                        _h.label = 7;
                     case 7:
                         entity_1_1 = entity_1.next();
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_4_1 = _j.sent();
+                        e_4_1 = _h.sent();
                         e_4 = { error: e_4_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (entity_1_1 && !entity_1_1.done && (_g = entity_1.return)) _g.call(entity_1);
+                            if (entity_1_1 && !entity_1_1.done && (_f = entity_1.return)) _f.call(entity_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 11:
-                        _d = (_c = Promise).all;
+                        _c = promiseAll;
                         return [4 /*yield*/, this._edp.insertMany(raw)];
-                    case 12: return [2 /*return*/, _d.apply(_c, [(_j.sent()).map(function (item, i) { return refs_1[i].processInsertResponseDto(item); })])];
+                    case 12: return [2 /*return*/, _c.apply(void 0, [_h.sent(), function (item, i) { return refs_1[i].processInsertResponseDto(item); }])];
                     case 13:
                         r = [];
-                        _j.label = 14;
+                        _h.label = 14;
                     case 14:
-                        _j.trys.push([14, 19, 20, 21]);
+                        _h.trys.push([14, 19, 20, 21]);
                         entity_2 = tslib_1.__values(entity), entity_2_1 = entity_2.next();
-                        _j.label = 15;
+                        _h.label = 15;
                     case 15:
                         if (!!entity_2_1.done) return [3 /*break*/, 18];
                         item = entity_2_1.value;
-                        _f = (_e = r).push;
+                        _e = (_d = r).push;
                         return [4 /*yield*/, this.insert(item)];
                     case 16:
-                        _f.apply(_e, [_j.sent()]);
-                        _j.label = 17;
+                        _e.apply(_d, [_h.sent()]);
+                        _h.label = 17;
                     case 17:
                         entity_2_1 = entity_2.next();
                         return [3 /*break*/, 15];
                     case 18: return [3 /*break*/, 21];
                     case 19:
-                        e_5_1 = _j.sent();
+                        e_5_1 = _h.sent();
                         e_5 = { error: e_5_1 };
                         return [3 /*break*/, 21];
                     case 20:
                         try {
-                            if (entity_2_1 && !entity_2_1.done && (_h = entity_2.return)) _h.call(entity_2);
+                            if (entity_2_1 && !entity_2_1.done && (_g = entity_2.return)) _g.call(entity_2);
                         }
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
@@ -368,9 +368,9 @@ var RepositoryImplementation = /** @class */ (function () {
                         if (!ref.isNew())
                             throw 'Item is not new';
                         return [4 /*yield*/, ref.save()];
-                    case 24: return [2 /*return*/, _j.sent()];
+                    case 24: return [2 /*return*/, _h.sent()];
                     case 25: return [4 /*yield*/, this.getEntityRef(this.create(entity)).save()];
-                    case 26: return [2 /*return*/, _j.sent()];
+                    case 26: return [2 /*return*/, _h.sent()];
                     case 27: return [2 /*return*/];
                 }
             });
@@ -589,7 +589,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 1];
-                        return [2 /*return*/, Promise.all(entity.map(function (x) { return _this.save(x); }))];
+                        return [2 /*return*/, promiseAll(entity, function (x) { return _this.save(x); })];
                     case 1:
                         ref = (0, getEntityRef_js_1.getEntityRef)(entity, false);
                         if (!ref) return [3 /*break*/, 3];
@@ -836,12 +836,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [4 /*yield*/, Promise.all(rawRows.map(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                    case 8: return [4 /*yield*/, promiseAll(rawRows, function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, this._mapRawDataToResult(r, loadFields)];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
-                        }); }); }))];
+                        }); }); })];
                     case 9:
                         result = _j.sent();
                         _loop_1 = function (col) {
@@ -1613,7 +1613,7 @@ var rowHelperBase = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(tslib_1.__spreadArray([], tslib_1.__read(this.lookups.values()), false).map(function (x) { return x.waitLoad(); }))];
+                    case 0: return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.lookups.values()), false), function (x) { return x.waitLoad(); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1886,7 +1886,7 @@ var rowHelperBase = /** @class */ (function () {
                             }
                             finally { if (e_29) throw e_29.error; }
                         }
-                        return [4 /*yield*/, Promise.all(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false).map(function (x) { return x.load(); }))];
+                        return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false).filter(function (f) { return !(0, relationInfoMember_js_1.getRelationFieldInfo)(f.metadata); }), function (x) { return x.load(); })];
                     case 1:
                         _d.sent();
                         return [2 /*return*/];
@@ -3853,3 +3853,28 @@ function getRepository(entity) {
     return entity;
 }
 exports.getRepository = getRepository;
+function promiseAll(array, mapToPromise) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var result, index, element, _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    result = [];
+                    index = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(index < array.length)) return [3 /*break*/, 4];
+                    element = array[index];
+                    _b = (_a = result).push;
+                    return [4 /*yield*/, mapToPromise(element, index)];
+                case 2:
+                    _b.apply(_a, [_c.sent()]);
+                    _c.label = 3;
+                case 3:
+                    index++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/, result];
+            }
+        });
+    });
+}

package/src/remult3/remult3.d.ts

@@ -676,3 +676,6 @@ export interface ClassDecoratorContextStub<Class extends new (...args: any) => a
     addInitializer(initializer: (this: Class) => void): void;
 }
 export type ClassFieldDecorator<entityType, valueType> = (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;
+export declare const flags: {
+    error500RetryCount: number;
+};

package/src/remult3/remult3.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.flags = void 0;
+exports.flags = {
+    error500RetryCount: 4,
+};
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
-//y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
-//y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
-//y2 - readonly key: keyof MembersOnly<entityType> & string
+//y1 - live query with count #436
+//y1 - live query errort that appears in tests but I can't understand why - `open connection error `
+//y1 TODO - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+//y1 TODO - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
+//y1 TODO -  readonly key: keyof MembersOnly<entityType> & string
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -23,14 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //p1 - wait a second to close stream
 //p1 - prepare the createEntity discussion
 //p1 - return error on connection error
-//p1 - reconsider key typing to be keyof & string
 //p1 - article on displayValue including it's definition for entities that is used in relations
+//p1 - article auth.js with express - played with it, requires type="module" and a few more configurations - https://github.com/noam-honig/express-auth
 //p2 -fix remult admin not to load the html into memory until used
-//y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
 //p2 - create foreign key constraints in user code - https://codesandbox.io/p/devbox/fk-validator-tdshcs
 //p2 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string} also checkout the admin* as it should probably be something else and didn't work in hono
-//p1 - article auth.js with express - played with it, requires type="module" and a few more configurations - https://github.com/noam-honig/express-auth
 //y2 - fix validators cache
 //y2 - should we validate relations
 //y1 - dependency of live query tables  live query refresh of view on table update
@@ -80,7 +84,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //p1 - when a tasks table exists in a different schema - we get many errors
 //p1 - live query with include
 //p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
-//p2 - when subscribe is forbidden - the query still runs after the renew process
 //p2 - 'update tasks set  where id = $1
 //p2 - type metadata.key - to keyof entity - based on cwis input
 //y2 - remove __dirname from tutorials