remult 0.26.11-next.1 → 0.26.11

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/src/live-query/LiveQueryClient.js

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

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

@@ -10,12 +10,10 @@ 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/remult3.js

@@ -3,7 +3,6 @@ export const flags = {
 };
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //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
@@ -23,7 +22,8 @@ export const flags = {
   }))
 */
 //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 - article on displayValue including it's definition for entities that is used in relations
@@ -81,6 +81,8 @@ export const flags = {
 //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
 //y2 - remove __dirname from tutorials

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.11-next.1",
+    "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/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/src/live-query/LiveQueryClient.js

@@ -14,7 +14,6 @@ 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;
@@ -88,7 +87,7 @@ var LiveQueryClient = /** @class */ (function () {
             });
         });
     };
-    LiveQueryClient.prototype._actuallyClose = function () {
+    LiveQueryClient.prototype.closeIfNoListeners = function () {
         if (this.client)
             if (this.queries.size === 0 && this.channels.size === 0) {
                 this.runPromise(this.client.then(function (x) { return x.close(); }));
@@ -97,12 +96,6 @@ 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;
@@ -196,8 +189,7 @@ var LiveQueryClient = /** @class */ (function () {
                             try {
                                 for (_a = tslib_1.__values(this.queries.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     q = _b.value;
-                                    if (q.gotAnyResult)
-                                        ids.push(q.queryChannel);
+                                    ids.push(q.queryChannel);
                                 }
                             }
                             catch (e_1_1) { e_1 = { error: e_1_1 }; }

package/src/live-query/SubscriptionChannel.js

@@ -12,7 +12,6 @@ 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 = [];
@@ -29,9 +28,7 @@ var LiveQuerySubscriber = /** @class */ (function () {
             var items;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        this.gotAnyResult = true;
-                        return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(this.repo)._fromJsonArray(result, this.query.options)];
+                    case 0: 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/remult3.js

@@ -6,7 +6,6 @@ exports.flags = {
 };
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //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
@@ -26,7 +25,8 @@ exports.flags = {
   }))
 */
 //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 - article on displayValue including it's definition for entities that is used in relations
@@ -84,6 +84,8 @@ exports.flags = {
 //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
 //y2 - remove __dirname from tutorials