@bbn/bbn 2.0.222 → 2.0.224

package/dist/db.d.ts

@@ -32,13 +32,15 @@ interface DbManager {
     _connections: Record<string, IDBDatabase>;
     _stores: Record<string, unknown>;
     ok: boolean;
-    open(name: string): Promise<IDbApi>;
-    add(database: string, name: string, structure: DbStructure): Promise<IDBDatabase>;
+    open(name: string, version?: number): Promise<IDbApi>;
+    add(database: string, name: string, structure: DbStructure): Promise<boolean>;
     openRaw(name: string, version?: number): Promise<IDBDatabase>;
     remove(database: string, name: string): Promise<void>;
     updateStructure(storeName: string, structure: DbStructure, database: IDBDatabase): void;
-    reopenWithUpgrade(name: string): Promise<IDBDatabase>;
+    importStructure(database: string, structure: Record<string, DbStructure>): Promise<void>;
+    reopenWithUpgrade(name: string): Promise<IDbApi>;
     getExistingVersion(name: string): Promise<number>;
+    close(database: string): void;
 }
 declare const db: DbManager;
 export default db;

package/dist/db.js

@@ -333,6 +333,13 @@ const db = {
     _connections: {},
     _stores: {},
     ok: idb !== undefined,
+    close(database) {
+        const conn = this._connections[database];
+        if (conn) {
+            conn.close();
+            delete this._connections[database];
+        }
+    },
     updateStructure(storeName, structure, database) {
         const primary = getPrimaryKey(structure);
         if (!database.objectStoreNames.contains(storeName)) {
@@ -346,6 +353,20 @@ const db = {
             });
         }
     },
+    importStructure(database, structure) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._structures[database]) {
+                this._structures[database] = {};
+            }
+            for (const storeName in structure) {
+                if (!this._structures[database].hasOwnProperty(storeName)) {
+                    this._structures[database][storeName] = structure[storeName];
+                }
+            }
+            yield this.reopenWithUpgrade(database);
+            this.close(database);
+        });
+    },
     getExistingVersion(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const live = this._connections[name];
@@ -385,37 +406,12 @@ const db = {
             const nextVersion = existingVersion + 1;
             log(_('Going from version %s to version %s for database %s', existingVersion, nextVersion, name));
             if (this._connections[name]) {
-                this._connections[name].close();
-                delete this._connections[name];
+                this.close(name);
             }
-            return new Promise((resolve, reject) => {
-                if (!idb) {
-                    reject(new Error(_('IndexedDB is not available')));
-                    return;
-                }
-                const req = idb.open(name, nextVersion);
-                req.onupgradeneeded = () => {
-                    const database = req.result;
-                    const dbStructure = this._structures[name] || {};
-                    iterate(dbStructure, (structure, storeName) => {
-                        if (!database.objectStoreNames.contains(storeName)) {
-                            this.updateStructure(storeName, structure, database);
-                        }
-                    });
-                };
-                req.onsuccess = () => {
-                    this._connections[name] = req.result;
-                    resolve(req.result);
-                };
-                req.onerror = () => reject(req.error);
-                req.onblocked = (event) => {
-                    log(event);
-                    reject(_('reopenWithUpgrade: Upgrade blocked for database %s. Please close other connections to proceed.', name));
-                };
-            });
+            return yield this.open(name, nextVersion);
         });
     },
-    open(database) {
+    open(database, version) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!idb) {
                 throw new Error(_('IndexedDB is not available'));
@@ -427,7 +423,7 @@ const db = {
                 return new DbObject(database);
             }
             yield new Promise((resolve, reject) => {
-                const req = idb.open(database);
+                const req = version ? idb.open(database, version) : idb.open(database);
                 req.onupgradeneeded = () => {
                     const db = req.result;
                     const dbStructure = this._structures[database] || {};
@@ -452,7 +448,6 @@ const db = {
     add(database, name, structure) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            log(_('Adding database structure for %s.%s', database, name));
             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)) {
                 throw new Error(_('The database structure for %s is not valid (missing keys, fields, or primary key)', name));
             }
@@ -460,28 +455,25 @@ const db = {
                 this._structures[database] = {};
             }
             this._structures[database][name] = structure;
-            const conn = this._connections[database];
-            if (conn) {
-                if (!conn.objectStoreNames.contains(name)) {
-                    return yield this.reopenWithUpgrade(database);
-                }
-                return conn;
-            }
-            // No live connection: inspect current DB and upgrade if needed.
-            const existingVersion = yield this.getExistingVersion(database);
-            const hasDbAlready = existingVersion > 0;
-            if (!hasDbAlready) {
+            const hadConn = !!this._connections[database];
+            let conn;
+            if (!hadConn) {
                 yield this.open(database);
-                return this._connections[database];
             }
+            conn = this._connections[database];
             // DB exists already: open temporarily and check if store exists
-            const tmp = yield this.openRaw(database);
-            const hasStore = tmp.objectStoreNames.contains(name);
-            tmp.close();
+            const hasStore = conn.objectStoreNames.contains(name);
             if (!hasStore) {
-                return yield this.reopenWithUpgrade(database);
+                const tmp = yield this.reopenWithUpgrade(database);
+                if (!this._connections[database]) {
+                    throw new Error(_('The database %s is not open after upgrade', database));
+                }
+                conn = this._connections[database];
             }
-            return yield this.openRaw(database);
+            if (!hadConn) {
+                this.close(database);
+            }
+            return true;
         });
     },
     openRaw(name, version) {
@@ -510,8 +502,7 @@ const db = {
                     return;
                 }
                 const nextVersion = conn.version + 1;
-                conn.close();
-                delete this._connections[database];
+                this.close(database);
                 yield new Promise((resolve, reject) => {
                     if (!idb) {
                         reject(new Error(_('IndexedDB is not available')));
@@ -522,10 +513,11 @@ const db = {
                         const dbInstance = req.result;
                         if (dbInstance.objectStoreNames.contains(name)) {
                             dbInstance.deleteObjectStore(name);
+                            dbInstance.close();
                         }
                     };
                     req.onsuccess = () => {
-                        this._connections[database] = req.result;
+                        req.result.close();
                         resolve();
                     };
                     req.onerror = () => reject(req.error);

package/dist/dt/classes/date.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtDate extends bbnDt<Temporal.PlainDate> {
     readonly kind: bbnDtKind;

package/dist/dt/classes/date.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 import getRow from '../../fn/object/getRow.js';
 export default class bbnDtDate extends bbnDt {

package/dist/dt/classes/dateTime.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtDateTime extends bbnDt<Temporal.PlainDateTime> {
     readonly kind: bbnDtKind;

package/dist/dt/classes/dateTime.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 import getRow from '../../fn/object/getRow.js';
 export default class bbnDtDateTime extends bbnDt {

package/dist/dt/classes/dt.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import { bbnDtTemporal } from '../vars/types.js';
 import bbnDtDuration from './duration.js';
 export declare abstract class bbnDt<TValue extends bbnDtTemporal> {

package/dist/dt/classes/dt.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _bbnDt_value;
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import { unitsCorrespondence, units, formatsMap } from '../vars/units.js';
 import _ from '../../_.js';
 import substr from '../../fn/string/substr.js';

package/dist/dt/classes/duration.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 export default class bbnDtDuration {
     #private;
     static fromUnit(value: number, unit: string): bbnDtDuration;

package/dist/dt/classes/duration.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _bbnDtDuration_instances, _bbnDtDuration_value, _bbnDtDuration_unit, _bbnDtDuration_getUnitValue;
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import { units, unitsCorrespondence } from '../vars/units.js';
 import getRow from '../../fn/object/getRow.js';
 const DURATION_RELATIVE_TO = Temporal.ZonedDateTime.from('1970-01-01T00:00Z[UTC]');

package/dist/dt/classes/monthDay.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtMonthDay extends bbnDt<Temporal.PlainMonthDay> {
     readonly kind: bbnDtKind;

package/dist/dt/classes/monthDay.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtMonthDay extends bbnDt {
     constructor(m, d) {

package/dist/dt/classes/time.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtTime extends bbnDt<Temporal.PlainTime> {
     readonly kind: 'time';

package/dist/dt/classes/time.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtTime extends bbnDt {
     constructor(h, i, s, ms) {

package/dist/dt/classes/yearMonth.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtYearMonth extends bbnDt<Temporal.PlainYearMonth> {
     readonly kind: bbnDtKind;

package/dist/dt/classes/yearMonth.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 import getRow from '../../fn/object/getRow.js';
 export default class bbnDtYearMonth extends bbnDt {

package/dist/dt/classes/zoned.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDt from './dt.js';
 export default class bbnDtZoned extends bbnDt<Temporal.ZonedDateTime> {
     readonly kind: bbnDtKind;

package/dist/dt/classes/zoned.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import fromJsDate from '../functions/fromJsDate.js';
 import bbnDt from './dt.js';
 export default class bbnDtZoned extends bbnDt {

package/dist/dt/functions/fromJsDate.d.ts

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 /**
  * Convert a JS Date into:
  *  - Temporal.Instant  (if hasZone=true)

package/dist/dt/functions/fromJsDate.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 /**
  * Convert a JS Date into:
  *  - Temporal.Instant  (if hasZone=true)

package/dist/dt/functions/parse.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import buildLocaleFromIntl from './buildLocaleFromIntl.js';
 import bbnDtZoned from '../classes/zoned.js';
 import bbnDtDateTime from '../classes/dateTime.js';

package/dist/dt/vars/types.d.ts

@@ -1,2 +1,2 @@
-import { Temporal } from '../../../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 export type bbnDtTemporal = Temporal.PlainDateTime | Temporal.PlainDate | Temporal.PlainTime | Temporal.PlainYearMonth | Temporal.PlainMonthDay | Temporal.ZonedDateTime;

package/dist/dt.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import bbnDtDateTime from './dt/classes/dateTime.js';
 import bbnDtDate from './dt/classes/date.js';
 import bbnDtTime from './dt/classes/zoned.js';

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { Temporal } from '../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 declare const bbn: Bbn;
 export { bbn as default, bbn, Temporal };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Temporal } from '../node_modules/temporal-polyfill/index.js';
+import { Temporal } from 'temporal-polyfill';
 import _ from './_.js';
 import $ from './$.js';
 import lng from './lng.js';

package/package.json

@@ -1,13 +1,24 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.222",
+  "version": "2.0.224",
   "description": "Javascript toolkit",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "type": "module",
   "files": [
-    "/dist"
+    "dist"
   ],
-  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./sw": {
+      "default": "./dist/bbn.sw.js"
+    }
+  },
   "scripts": {
     "type": "./node_modules/.bin/tsc",
     "gitauto": "git stage ./src/* ./*.ts ./*.json ./*.config.js ./test/*.mjs && git stage -f ./dist/* && git commit -m \"Latest changes\"",
@@ -24,7 +35,6 @@
   "author": "Thomas Nabet <thomas.nabet@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
@@ -32,7 +42,6 @@
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.1",
-    "dayjs": "^1.11.19",
     "jsdom": "^27.2.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^11.7.5",
@@ -40,9 +49,7 @@
     "ts-loader": "^9.5.4",
     "tslib": "^2.8.1",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "webpack": "^5.102.1",
-    "webpack-cli": "^6.0.1"
+    "typescript": "^5.9.3"
   },
   "bugs": {
     "url": "https://github.com/nabab/bbn-js/issues"