@bbn/bbn 2.0.235 → 2.0.237

package/dist/db.js

@@ -65,6 +65,10 @@ const fieldsFromFilter = (filter, fields = []) => {
     return fields;
 };
 const getPrimaryKey = (structure) => {
+    var _a, _b;
+    if (!((_b = (_a = structure.keys) === null || _a === void 0 ? void 0 : _a.PRIMARY) === null || _b === void 0 ? void 0 : _b.columns)) {
+        throw new Error(_('No primary key defined in the structure'));
+    }
     const cols = structure.keys.PRIMARY.columns;
     return cols.length > 1 ? cols : cols[0];
 };
@@ -90,6 +94,7 @@ class DbObject {
         return __awaiter(this, arguments, void 0, function* (database = '') {
             let conn = db._connections[database || this.dbName];
             if (!conn) {
+                debugger;
                 yield db.open(database || this.dbName);
                 if (!db._connections[database || this.dbName]) {
                     throw new Error(_('The database %s is not open', this.dbName));
@@ -118,13 +123,21 @@ class DbObject {
             const tx = connection.transaction([table], mode);
             tx.onabort = () => {
                 this.lastErr = tx.error;
-                log(tx.error);
+                log("Abort in store transaction: " + table, tx.error);
             };
             tx.onerror = () => {
                 this.lastErr = tx.error;
-                log(tx.error);
+                log("Error in store transaction: " + table, tx.error);
             };
-            return [tx, tx.objectStore(table)];
+            try {
+                const os = tx.objectStore(table);
+                return [tx, os];
+            }
+            catch (e) {
+                this.lastErr = e;
+                log("Error getting object store: " + table, e);
+                throw new Error(_('Error getting table %s from database %s', table, this.dbName));
+            }
         });
     }
     lastError() {
@@ -362,15 +375,31 @@ const db = {
     },
     importStructure(database, structure) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             if (!this._structures[database]) {
                 this._structures[database] = {};
             }
+            if (this._connections[database]) {
+                throw new Error(_('Database %s is already open. Close it before adding a new store.', database));
+            }
+            yield this.open(database);
+            let conn = this._connections[database];
+            let upgrade = false;
             for (const storeName in structure) {
-                if (!this._structures[database].hasOwnProperty(storeName)) {
-                    this._structures[database][storeName] = structure[storeName];
+                if (!((_b = (_a = structure[storeName]) === null || _a === void 0 ? void 0 : _a.keys) === null || _b === void 0 ? void 0 : _b.PRIMARY) || !((_c = structure[storeName]) === null || _c === void 0 ? void 0 : _c.fields)) {
+                    log("Error on importStructure with store " + storeName, structure[storeName]);
+                    throw new Error(_('The database structure for %s is not valid (missing keys, fields, or primary key)', storeName));
                 }
+                this._structures[database][storeName] = structure[storeName];
+                // DB exists already: open temporarily and check if store exists
+                const hasStore = conn.objectStoreNames.contains(storeName);
+                if (!hasStore) {
+                    upgrade = true;
+                }
+            }
+            if (upgrade) {
+                yield this.reopenWithUpgrade(database);
             }
-            yield this.reopenWithUpgrade(database);
             this.close(database);
         });
     },
@@ -433,6 +462,7 @@ const db = {
                 const req = version ? idb.open(database, version) : idb.open(database);
                 req.onupgradeneeded = () => {
                     const db = req.result;
+                    this._connections[database] = req.result;
                     const dbStructure = this._structures[database] || {};
                     iterate(dbStructure, (structure, storeName) => {
                         if (!db.objectStoreNames.contains(storeName)) {
@@ -457,6 +487,7 @@ const db = {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             if (!((_a = structure === null || structure === void 0 ? void 0 : structure.keys) === null || _a === void 0 ? void 0 : _a.PRIMARY) || !(structure === null || structure === void 0 ? void 0 : structure.fields)) {
+                log("Error on add", structure);
                 throw new Error(_('The database structure for %s is not valid (missing keys, fields, or primary key)', name));
             }
             if (!this._structures[database]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.235",
+  "version": "2.0.237",
   "description": "Javascript toolkit",
   "main": "./dist/index.js",
   "module": "./dist/index.js",