remult 0.26.11-next.0 → 0.26.11

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

@@ -29,13 +29,13 @@ export class SqliteCoreDataProvider {
         };
     }
     async transaction(action) {
-        this.createCommand().execute('Begin Transaction');
+        await this.createCommand().execute('Begin Transaction');
         try {
             await action(this);
-            this.createCommand().execute('Commit');
+            await this.createCommand().execute('Commit');
         }
         catch (err) {
-            this.createCommand().execute('Rollback');
+            await this.createCommand().execute('Rollback');
             throw err;
         }
     }

package/esm/remult-turso.js

@@ -0,0 +1,59 @@
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
+import { cast } from './src/isOfType.js';
+export class TursoDataProvider extends SqliteCoreDataProvider {
+    client;
+    constructor(client) {
+        super(() => new TursoCommand(client), async () => {
+            await cast(this.client, 'close').close();
+        }, false);
+        this.client = client;
+    }
+    async transaction(action) {
+        const trans = await cast(this.client, 'transaction').transaction();
+        try {
+            await action(new TursoDataProvider(trans));
+            await trans.commit();
+        }
+        catch (err) {
+            await trans.rollback();
+            throw err;
+        }
+    }
+}
+class TursoCommand {
+    db;
+    values = {};
+    i = 1;
+    constructor(db) {
+        this.db = db;
+    }
+    async execute(sql) {
+        return new TursoSqlResult(await this.db.execute({
+            sql,
+            args: this.values,
+        }));
+    }
+    addParameterAndReturnSqlToken(val) {
+        return this.param(val);
+    }
+    param(val) {
+        if (val instanceof Date)
+            val = val.valueOf();
+        if (typeof val === 'boolean')
+            val = val ? 1 : 0;
+        const key = ':' + this.i++;
+        this.values[key.substring(1)] = val;
+        return key;
+    }
+}
+class TursoSqlResult {
+    result;
+    constructor(result) {
+        this.result = result;
+        this.rows = result.rows;
+    }
+    rows;
+    getColumnKeyInResultForIndexInSelect(index) {
+        return this.result.columns[index];
+    }
+}

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/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/remult3/RepositoryImplementation.js

@@ -1144,7 +1144,7 @@ class rowHelperBase {
                     }
                 }
         }
-        await promiseAll([...this.fields], (x) => x.load());
+        await promiseAll([...this.fields].filter((f) => !getRelationFieldInfo(f.metadata)), (x) => x.load());
     }
 }
 export class rowHelperImplementation extends rowHelperBase {

package/esm/src/remult3/remult3.js

@@ -1,16 +1,11 @@
-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 - The retry on server error is too wide (error 500, basically any server error) 50 retries is annoying
-  - vite doesn't say proxy error, so we can't listen to that to know that we are in dev
-  - Our SSE has it's own separate retry every 500 ms that is also problematic
-  - when using concurrently - on any server error - the terminal is flooded by the error messages
-//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 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({},{
@@ -27,16 +22,16 @@ export {};
   }))
 */
 //p1 - consider upsert (where,set)
-//p1 - wait a second to close stream
+//y1 - wait a second to close stream -see pr
+//p1 - Consider enforcing serial operations on JSON database to prevent data loss
 //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 - 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
@@ -86,6 +81,7 @@ 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)
+//y2 - Fix problem with promise all in sql expression recurssion - when using PromiseAll in row relation loading, some sql expressions appear is recursion call even if they are not
 //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

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.11-next.0",
+    "version": "0.26.11",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {
@@ -116,6 +116,11 @@
             "import": "./esm/remult-sqlite3.js",
             "types": "./remult-sqlite3.d.ts"
         },
+        "./remult-turso": {
+            "require": "./remult-turso.js",
+            "import": "./esm/remult-turso.js",
+            "types": "./remult-turso.d.ts"
+        },
         "./remult-bun-sqlite": {
             "require": "./remult-bun-sqlite.js",
             "import": "./esm/remult-bun-sqlite.js",

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.js

@@ -52,21 +52,26 @@ var SqliteCoreDataProvider = /** @class */ (function () {
             var err_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        this.createCommand().execute('Begin Transaction');
-                        _a.label = 1;
+                    case 0: return [4 /*yield*/, this.createCommand().execute('Begin Transaction')];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, action(this)];
-                    case 2:
                         _a.sent();
-                        this.createCommand().execute('Commit');
-                        return [3 /*break*/, 4];
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 5, , 7]);
+                        return [4 /*yield*/, action(this)];
                     case 3:
+                        _a.sent();
+                        return [4 /*yield*/, this.createCommand().execute('Commit')];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 7];
+                    case 5:
                         err_1 = _a.sent();
-                        this.createCommand().execute('Rollback');
+                        return [4 /*yield*/, this.createCommand().execute('Rollback')];
+                    case 6:
+                        _a.sent();
                         throw err_1;
-                    case 4: return [2 /*return*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });

package/remult-sqlite3.d.ts

@@ -1,5 +1,5 @@
 import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
-import { Database } from 'sqlite3';
+import type { Database } from 'sqlite3';
 export declare class Sqlite3DataProvider extends SqliteCoreDataProvider {
     constructor(db: Database);
 }

package/remult-turso.d.ts

@@ -0,0 +1,8 @@
+import { SqlImplementation } from './index.js';
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
+import type { Client } from '@libsql/client';
+export declare class TursoDataProvider extends SqliteCoreDataProvider {
+    private client;
+    constructor(client: Pick<Client, 'execute'>);
+    transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
+}

package/remult-turso.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TursoDataProvider = void 0;
+var tslib_1 = require("tslib");
+var remult_sqlite_core_js_1 = require("./remult-sqlite-core.js");
+var isOfType_js_1 = require("./src/isOfType.js");
+var TursoDataProvider = /** @class */ (function (_super) {
+    tslib_1.__extends(TursoDataProvider, _super);
+    function TursoDataProvider(client) {
+        var _this = _super.call(this, function () { return new TursoCommand(client); }, 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*/, (0, isOfType_js_1.cast)(this.client, 'close').close()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); }, false) || this;
+        _this.client = client;
+        return _this;
+    }
+    TursoDataProvider.prototype.transaction = function (action) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var trans, err_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, isOfType_js_1.cast)(this.client, 'transaction').transaction()];
+                    case 1:
+                        trans = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 5, , 7]);
+                        return [4 /*yield*/, action(new TursoDataProvider(trans))];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, trans.commit()];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 7];
+                    case 5:
+                        err_1 = _a.sent();
+                        return [4 /*yield*/, trans.rollback()];
+                    case 6:
+                        _a.sent();
+                        throw err_1;
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return TursoDataProvider;
+}(remult_sqlite_core_js_1.SqliteCoreDataProvider));
+exports.TursoDataProvider = TursoDataProvider;
+var TursoCommand = /** @class */ (function () {
+    function TursoCommand(db) {
+        this.db = db;
+        this.values = {};
+        this.i = 1;
+    }
+    TursoCommand.prototype.execute = function (sql) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = TursoSqlResult.bind;
+                        return [4 /*yield*/, this.db.execute({
+                                sql: sql,
+                                args: this.values,
+                            })];
+                    case 1: return [2 /*return*/, new (_a.apply(TursoSqlResult, [void 0, _b.sent()]))()];
+                }
+            });
+        });
+    };
+    TursoCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    TursoCommand.prototype.param = function (val) {
+        if (val instanceof Date)
+            val = val.valueOf();
+        if (typeof val === 'boolean')
+            val = val ? 1 : 0;
+        var key = ':' + this.i++;
+        this.values[key.substring(1)] = val;
+        return key;
+    };
+    return TursoCommand;
+}());
+var TursoSqlResult = /** @class */ (function () {
+    function TursoSqlResult(result) {
+        this.result = result;
+        this.rows = result.rows;
+    }
+    TursoSqlResult.prototype.getColumnKeyInResultForIndexInSelect = function (index) {
+        return this.result.columns[index];
+    };
+    return TursoSqlResult;
+}());

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/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/remult3/RepositoryImplementation.js

@@ -1886,7 +1886,7 @@ var rowHelperBase = /** @class */ (function () {
                             }
                             finally { if (e_29) throw e_29.error; }
                         }
-                        return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false), 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*/];

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,17 +1,14 @@
 "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 - The retry on server error is too wide (error 500, basically any server error) 50 retries is annoying
-  - vite doesn't say proxy error, so we can't listen to that to know that we are in dev
-  - Our SSE has it's own separate retry every 500 ms that is also problematic
-  - when using concurrently - on any server error - the terminal is flooded by the error messages
-//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 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({},{
@@ -28,16 +25,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
   }))
 */
 //p1 - consider upsert (where,set)
-//p1 - wait a second to close stream
+//y1 - wait a second to close stream -see pr
+//p1 - Consider enforcing serial operations on JSON database to prevent data loss
 //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 - 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
@@ -87,6 +84,7 @@ 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)
+//y2 - Fix problem with promise all in sql expression recurssion - when using PromiseAll in row relation loading, some sql expressions appear is recursion call even if they are not
 //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