remult 3.3.6 → 3.3.8

package/server/remult-admin-html.d.ts

@@ -0,0 +1,2 @@
+import type { AdminDisplayOptions } from './remult-admin.js';
+export default function remultAdminHtml(options: AdminDisplayOptions): string;

package/server/remult-admin-html.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = remultAdminHtml;
+var get_remult_admin_html_js_1 = require("./get-remult-admin-html.js");
+function remultAdminHtml(options) {
+    var head = options.head, rootPath = options.rootPath, requireAuthToken = options.requireAuthToken, disableLiveQuery = options.disableLiveQuery;
+    return (0, get_remult_admin_html_js_1.getHtml)()
+        .replace('<!--PLACE_HERE_HEAD-->', head)
+        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({
+        rootPath: rootPath,
+        requireAuthToken: requireAuthToken,
+        disableLiveQuery: disableLiveQuery,
+    }), "\n</script>"));
+}

package/server/remult-admin.d.ts

@@ -50,6 +50,5 @@ export interface AdminDisplayOptions {
     requireAuthToken: boolean;
     disableLiveQuery: boolean;
 }
-export default function remultAdminHtml(options: AdminDisplayOptions): string;
 export declare function buildEntityInfo(options: AdminEntitiesOptions): EntityUIInfo[];
 export type RelationsToOneValues = Record<string, Map<any, any>>;

package/server/remult-admin.js

@@ -1,23 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = remultAdminHtml;
 exports.buildEntityInfo = buildEntityInfo;
 var tslib_1 = require("tslib");
 var relationInfoMember_js_1 = require("../src/remult3/relationInfoMember.js");
 var filter_interfaces_js_1 = require("../src/filter/filter-interfaces.js");
-var get_remult_admin_html_js_1 = require("./get-remult-admin-html.js");
 var RepositoryImplementation_js_1 = require("../src/remult3/RepositoryImplementation.js");
 var inputTypes_js_1 = require("../inputTypes.js");
-function remultAdminHtml(options) {
-    var head = options.head, rootPath = options.rootPath, requireAuthToken = options.requireAuthToken, disableLiveQuery = options.disableLiveQuery;
-    return (0, get_remult_admin_html_js_1.getHtml)()
-        .replace('<!--PLACE_HERE_HEAD-->', head)
-        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({
-        rootPath: rootPath,
-        requireAuthToken: requireAuthToken,
-        disableLiveQuery: disableLiveQuery,
-    }), "\n</script>"));
-}
 function buildEntityInfo(options) {
     var e_1, _a;
     var _b, _c;

package/server/remult-api-server.js

@@ -15,7 +15,7 @@ var getEntityRef_js_1 = require("../src/remult3/getEntityRef.js");
 var server_action_js_1 = require("../src/server-action.js");
 var server_action_info_js_1 = require("../src/server-action-info.js");
 var remult_static_js_1 = require("../src/remult-static.js");
-var remult_admin_js_1 = tslib_1.__importStar(require("./remult-admin.js"));
+var remult_admin_js_1 = require("./remult-admin.js");
 var isOfType_js_1 = require("../src/isOfType.js");
 var initDataProviderOrJson_js_1 = require("./initDataProviderOrJson.js");
 var module_js_1 = require("./module.js");
@@ -389,20 +389,22 @@ var RemultServerImplementation = /** @class */ (function () {
             if (this.options.admin !== undefined && this.options.admin !== false) {
                 var admin = function () {
                     return _this.process(function (remult, req, res, orig, origResponse) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var allowed, head, requireAuthToken, disableLiveQuery;
+                        var allowed, head, requireAuthToken, disableLiveQuery, remultAdminHtml;
                         var _a, _b, _c, _d, _e, _f, _g;
                         return tslib_1.__generator(this, function (_h) {
-                            allowed = (0, isOfType_js_1.isOfType)(this.options.admin, 'allow')
-                                ? this.options.admin.allow
-                                : this.options.admin;
-                            if (remult.isAllowed(allowed)) {
-                                if (((_a = orig === null || orig === void 0 ? void 0 : orig.params) === null || _a === void 0 ? void 0 : _a.id) === '__entities-metadata') {
+                            switch (_h.label) {
+                                case 0:
+                                    allowed = (0, isOfType_js_1.isOfType)(this.options.admin, 'allow')
+                                        ? this.options.admin.allow
+                                        : this.options.admin;
+                                    if (!remult.isAllowed(allowed)) return [3 /*break*/, 4];
+                                    if (!(((_a = orig === null || orig === void 0 ? void 0 : orig.params) === null || _a === void 0 ? void 0 : _a.id) === '__entities-metadata')) return [3 /*break*/, 1];
                                     res.success((0, remult_admin_js_1.buildEntityInfo)({
                                         remult: remult,
                                         entities: this.entities,
                                     }));
-                                }
-                                else {
+                                    return [3 /*break*/, 3];
+                                case 1:
                                     head = '<title>Admin</title>';
                                     requireAuthToken = false;
                                     disableLiveQuery = false;
@@ -413,17 +415,22 @@ var RemultServerImplementation = /** @class */ (function () {
                                         disableLiveQuery =
                                             (_f = this.options.admin.disableLiveQuery) !== null && _f !== void 0 ? _f : disableLiveQuery;
                                     }
-                                    origResponse.send((0, remult_admin_js_1.default)({
+                                    return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('./remult-admin-html.js')); })];
+                                case 2:
+                                    remultAdminHtml = (_h.sent()).default;
+                                    origResponse.send(remultAdminHtml({
                                         rootPath: (_g = this.options.rootPath) !== null && _g !== void 0 ? _g : '/api',
                                         head: head,
                                         requireAuthToken: requireAuthToken,
                                         disableLiveQuery: disableLiveQuery,
                                     }));
-                                }
+                                    _h.label = 3;
+                                case 3: return [3 /*break*/, 5];
+                                case 4:
+                                    res.notFound();
+                                    _h.label = 5;
+                                case 5: return [2 /*return*/];
                             }
-                            else
-                                res.notFound();
-                            return [2 /*return*/];
                         });
                     }); });
                 };

package/src/data-providers/json-entity-indexed-db-data-provider.js

@@ -11,31 +11,57 @@ var JsonEntityIndexedDbStorage = /** @class */ (function () {
         this.supportsRawJson = true;
     }
     JsonEntityIndexedDbStorage.prototype.getItem = function (entityDbName) {
+        return this.run('readonly', function (s) { return s.get(entityDbName); });
+    };
+    JsonEntityIndexedDbStorage.prototype.setItem = function (entityDbName, json) {
+        return this.run('readwrite', function (s) {
+            return s.put(json, entityDbName);
+        });
+    };
+    JsonEntityIndexedDbStorage.prototype.removeItem = function (entityDbName) {
+        return this.run('readwrite', function (s) { return s.delete(entityDbName); });
+    };
+    JsonEntityIndexedDbStorage.prototype.clear = function () {
+        return this.run('readwrite', function (s) { return s.clear(); });
+    };
+    //@internal
+    JsonEntityIndexedDbStorage.prototype.run = function (mode, op) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var attempt, err_1;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var transaction, store, request;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.init()];
-                                case 1:
-                                    transaction = (_a.sent()).transaction([this.storeName], 'readonly');
-                                    store = transaction.objectStore(this.storeName);
-                                    request = store.get(entityDbName);
-                                    request.onerror = function (event) { return reject(request.error); };
-                                    request.onsuccess = function (event) {
-                                        if (request.result) {
-                                            resolve(request.result);
-                                        }
-                                        else {
-                                            resolve(null);
-                                        }
-                                    };
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0:
+                        attempt = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var db;
+                            var _this = this;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.init()];
+                                    case 1:
+                                        db = _a.sent();
+                                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                                var request = op(db.transaction([_this.storeName], mode).objectStore(_this.storeName));
+                                                request.onerror = function () { return reject(request.error); };
+                                                request.onsuccess = function () { var _a; return resolve((_a = request.result) !== null && _a !== void 0 ? _a : null); };
+                                            })];
+                                }
+                            });
+                        }); };
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 5]);
+                        return [4 /*yield*/, attempt()];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        err_1 = _a.sent();
+                        if ((err_1 === null || err_1 === void 0 ? void 0 : err_1.name) !== 'InvalidStateError')
+                            throw err_1;
+                        this.db = undefined;
+                        return [4 /*yield*/, attempt()];
+                    case 4: return [2 /*return*/, _a.sent()];
+                    case 5: return [2 /*return*/];
+                }
             });
         });
     };
@@ -47,95 +73,36 @@ var JsonEntityIndexedDbStorage = /** @class */ (function () {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!!this.db) return [3 /*break*/, 2];
+                        if (this.db)
+                            return [2 /*return*/, this.db];
                         _a = this;
                         return [4 /*yield*/, new Promise(function (resolve, reject) {
-                                var db;
                                 var request = indexedDB.open(_this.dbName, 1);
-                                request.onerror = function (event) { return reject(request.error); };
-                                request.onsuccess = function (event) {
-                                    db = request.result;
-                                    resolve(db);
+                                request.onerror = function () { return reject(request.error); };
+                                request.onupgradeneeded = function () {
+                                    return request.result.createObjectStore(_this.storeName);
                                 };
-                                request.onupgradeneeded = function (event) {
-                                    db = request.result;
-                                    db.createObjectStore(_this.storeName);
+                                request.onsuccess = function () {
+                                    var db = request.result;
+                                    var forget = function () {
+                                        if (_this.db === db)
+                                            _this.db = undefined;
+                                    };
+                                    db.onclose = forget;
+                                    db.onversionchange = function () {
+                                        db.close();
+                                        forget();
+                                    };
+                                    resolve(db);
                                 };
                             })];
                     case 1:
                         _a.db = _b.sent();
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, this.db];
+                        return [2 /*return*/, this.db];
                 }
             });
         });
     };
-    JsonEntityIndexedDbStorage.prototype.setItem = function (entityDbName, json) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var transaction, store, request;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.init()];
-                                case 1:
-                                    transaction = (_a.sent()).transaction([this.storeName], 'readwrite');
-                                    store = transaction.objectStore(this.storeName);
-                                    request = store.put(json, entityDbName);
-                                    request.onerror = function (event) { return reject(request.error); };
-                                    request.onsuccess = function (event) { return resolve(); };
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    JsonEntityIndexedDbStorage.prototype.removeItem = function (entityDbName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var transaction, store, request;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.init()];
-                                case 1:
-                                    transaction = (_a.sent()).transaction([this.storeName], 'readwrite');
-                                    store = transaction.objectStore(this.storeName);
-                                    request = store.delete(entityDbName);
-                                    request.onerror = function (_event) { return reject(request.error); };
-                                    request.onsuccess = function (_event) { return resolve(); };
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    JsonEntityIndexedDbStorage.prototype.clear = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var transaction, store, request;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.init()];
-                                case 1:
-                                    transaction = (_a.sent()).transaction([this.storeName], 'readwrite');
-                                    store = transaction.objectStore(this.storeName);
-                                    request = store.clear();
-                                    request.onerror = function (_event) { return reject(request.error); };
-                                    request.onsuccess = function (_event) { return resolve(); };
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
     return JsonEntityIndexedDbStorage;
 }());
 exports.JsonEntityIndexedDbStorage = JsonEntityIndexedDbStorage;

package/src/remult3/RepositoryImplementation.d.ts

@@ -313,8 +313,8 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     toJson(val: T): any;
     fromDb(val: any): T;
     toDb(val: T): any;
-    toInput(val: T, inputType: string): string;
-    fromInput(val: string, inputType: string): T;
+    toInput(val: T, inputType?: string): string;
+    fromInput(val: string, inputType?: string): T;
     displayValue?(val: T): string;
     fieldTypeInDb?: string;
     inputType?: string;