@naturalcycles/db-lib 10.0.2 → 10.1.0

package/dist/adapter/cachedb/cache.db.d.ts

@@ -1,10 +1,10 @@
 import type { JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import { BaseCommonDB } from '../../base.common.db';
-import type { CommonDB, CommonDBSupport } from '../../common.db';
-import type { RunQueryResult } from '../../db.model';
-import type { DBQuery } from '../../query/dbQuery';
-import type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBSaveOptions, CacheDBStreamOptions } from './cache.db.model';
+import { BaseCommonDB } from '../../base.common.db.js';
+import type { CommonDB, CommonDBSupport } from '../../common.db.js';
+import type { RunQueryResult } from '../../db.model.js';
+import type { DBQuery } from '../../query/dbQuery.js';
+import type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBSaveOptions, CacheDBStreamOptions } from './cache.db.model.js';
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
  * and does in-memory caching.

package/dist/adapter/cachedb/cache.db.js

@@ -1,19 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheDB = void 0;
-const node_stream_1 = require("node:stream");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const base_common_db_1 = require("../../base.common.db");
-const common_db_1 = require("../../common.db");
+import { Readable } from 'node:stream';
+import { _isTruthy } from '@naturalcycles/js-lib';
+import { BaseCommonDB } from '../../base.common.db.js';
+import { commonDBFullSupport } from '../../common.db.js';
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
  * and does in-memory caching.
  *
  * Queries always hit downstream (unless `onlyCache` is passed)
  */
-class CacheDB extends base_common_db_1.BaseCommonDB {
+export class CacheDB extends BaseCommonDB {
     support = {
-        ...common_db_1.commonDBFullSupport,
+        ...commonDBFullSupport,
         transactions: false,
         increment: false,
     };
@@ -78,7 +75,7 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
             }
         }
         // return in right order
-        return ids.map(id => resultMap[id]).filter(js_lib_1._isTruthy);
+        return ids.map(id => resultMap[id]).filter(_isTruthy);
     }
     async saveBatch(table, rows, opt = {}) {
         if (!opt.onlyCache && !this.cfg.onlyCache) {
@@ -147,7 +144,7 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
             return stream;
         }
         if (opt.skipCache || this.cfg.skipCache)
-            return node_stream_1.Readable.from([]);
+            return Readable.from([]);
         const stream = this.cfg.cacheDB.streamQuery(q, opt);
         // if (this.cfg.logCached) {
         //   let count = 0
@@ -195,4 +192,3 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
         return updated || 0;
     }
 }
-exports.CacheDB = CacheDB;

package/dist/adapter/cachedb/cache.db.model.d.ts

@@ -1,6 +1,6 @@
 import type { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib';
-import type { CommonDB } from '../../common.db';
-import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions } from '../../db.model';
+import type { CommonDB } from '../../common.db.js';
+import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions } from '../../db.model.js';
 export interface CacheDBCfg {
     name: string;
     cacheDB: CommonDB;

package/dist/adapter/cachedb/cache.db.model.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/adapter/cachedb/index.d.ts

@@ -1,4 +1,4 @@
-import { CacheDB } from './cache.db';
-import type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBStreamOptions } from './cache.db.model';
+import { CacheDB } from './cache.db.js';
+import type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBStreamOptions } from './cache.db.model.js';
 export type { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBStreamOptions };
 export { CacheDB };

package/dist/adapter/cachedb/index.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheDB = void 0;
-const cache_db_1 = require("./cache.db");
-Object.defineProperty(exports, "CacheDB", { enumerable: true, get: function () { return cache_db_1.CacheDB; } });
+import { CacheDB } from './cache.db.js';
+export { CacheDB };

package/dist/adapter/file/file.db.d.ts

@@ -1,11 +1,10 @@
 import type { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import type { CommonDBSupport, DBSaveBatchOperation } from '../..';
-import { BaseCommonDB } from '../..';
-import type { CommonDB } from '../../common.db';
-import type { CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, RunQueryResult } from '../../db.model';
-import type { DBQuery } from '../../query/dbQuery';
-import type { FileDBCfg } from './file.db.model';
+import { BaseCommonDB } from '../../base.common.db.js';
+import type { CommonDB, CommonDBSupport } from '../../common.db.js';
+import type { CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBSaveBatchOperation, RunQueryResult } from '../../db.model.js';
+import type { DBQuery } from '../../query/dbQuery.js';
+import type { FileDBCfg } from './file.db.model.js';
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
  * "whole file" means that the persistence layer doesn't allow any querying,

package/dist/adapter/file/file.db.js

@@ -1,9 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileDB = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const __1 = require("../..");
+import { _assert, _by, _deepEquals, _filterUndefinedValues, _since, _sortBy, _sortObjectDeep, _stringMapValues, generateJsonSchemaFromData, localTime, } from '@naturalcycles/js-lib';
+import { dimGrey, readableCreate } from '@naturalcycles/nodejs-lib';
+import { BaseCommonDB } from '../../base.common.db.js';
+import { commonDBFullSupport } from '../../common.db.js';
+import { queryInMemory } from '../inmemory/queryInMemory.js';
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
  * "whole file" means that the persistence layer doesn't allow any querying,
@@ -14,9 +13,9 @@ const __1 = require("../..");
  * Each load/query operation loads *whole* file from the persitence layer.
  * Each save operation saves *whole* file to the persistence layer.
  */
-class FileDB extends __1.BaseCommonDB {
+export class FileDB extends BaseCommonDB {
     support = {
-        ...__1.commonDBFullSupport,
+        ...commonDBFullSupport,
         bufferValues: false, // todo: implement
         insertSaveMethod: false,
         updateSaveMethod: false,
@@ -45,19 +44,19 @@ class FileDB extends __1.BaseCommonDB {
         return tables;
     }
     async getByIds(table, ids, _opt) {
-        const byId = (0, js_lib_1._by)(await this.loadFile(table), r => r.id);
+        const byId = _by(await this.loadFile(table), r => r.id);
         return ids.map(id => byId[id]).filter(Boolean);
     }
     async saveBatch(table, rows, _opt) {
         if (!rows.length)
             return; // save some api calls
         // 1. Load the whole file
-        const byId = (0, js_lib_1._by)(await this.loadFile(table), r => r.id);
+        const byId = _by(await this.loadFile(table), r => r.id);
         // 2. Merge with new data (using ids)
         let saved = 0;
         rows.forEach(r => {
-            (0, js_lib_1._assert)(r.id, 'FileDB: row.id is required');
-            if (!(0, js_lib_1._deepEquals)(byId[r.id], r)) {
+            _assert(r.id, 'FileDB: row.id is required');
+            if (!_deepEquals(byId[r.id], r)) {
                 byId[r.id] = r;
                 saved++;
             }
@@ -65,19 +64,19 @@ class FileDB extends __1.BaseCommonDB {
         // Only save if there are changed rows
         if (saved > 0) {
             // 3. Save the whole file
-            await this.saveFile(table, (0, js_lib_1._stringMapValues)(byId));
+            await this.saveFile(table, _stringMapValues(byId));
         }
     }
     async runQuery(q, _opt) {
         return {
-            rows: (0, __1.queryInMemory)(q, await this.loadFile(q.table)),
+            rows: queryInMemory(q, await this.loadFile(q.table)),
         };
     }
     async runQueryCount(q, _opt) {
         return (await this.loadFile(q.table)).length;
     }
     streamQuery(q, opt) {
-        const readable = (0, nodejs_lib_1.readableCreate)();
+        const readable = readableCreate();
         void this.runQuery(q, opt).then(({ rows }) => {
             rows.forEach(r => readable.push(r));
             readable.push(null); // done
@@ -85,19 +84,19 @@ class FileDB extends __1.BaseCommonDB {
         return readable;
     }
     async deleteByQuery(q, _opt) {
-        const byId = (0, js_lib_1._by)(await this.loadFile(q.table), r => r.id);
+        const byId = _by(await this.loadFile(q.table), r => r.id);
         let deleted = 0;
-        (0, __1.queryInMemory)(q, (0, js_lib_1._stringMapValues)(byId)).forEach(r => {
+        queryInMemory(q, _stringMapValues(byId)).forEach(r => {
             delete byId[r.id];
             deleted++;
         });
         if (deleted > 0) {
-            await this.saveFile(q.table, (0, js_lib_1._stringMapValues)(byId));
+            await this.saveFile(q.table, _stringMapValues(byId));
         }
         return deleted;
     }
     async deleteByIds(table, ids, _opt) {
-        const byId = (0, js_lib_1._by)(await this.loadFile(table), r => r.id);
+        const byId = _by(await this.loadFile(table), r => r.id);
         let deleted = 0;
         ids.forEach(id => {
             if (!byId[id])
@@ -106,14 +105,14 @@ class FileDB extends __1.BaseCommonDB {
             deleted++;
         });
         if (deleted > 0) {
-            await this.saveFile(table, (0, js_lib_1._stringMapValues)(byId));
+            await this.saveFile(table, _stringMapValues(byId));
         }
         return deleted;
     }
     async getTableSchema(table) {
         const rows = await this.loadFile(table);
         return {
-            ...(0, js_lib_1.generateJsonSchemaFromData)(rows),
+            ...generateJsonSchemaFromData(rows),
             $id: `${table}.schema.json`,
         };
     }
@@ -146,14 +145,14 @@ class FileDB extends __1.BaseCommonDB {
     //   return new FileDBTransaction(this)
     // }
     sortRows(rows) {
-        rows = rows.map(r => (0, js_lib_1._filterUndefinedValues)(r));
+        rows = rows.map(r => _filterUndefinedValues(r));
         if (this.cfg.sortOnSave) {
-            (0, js_lib_1._sortBy)(rows, r => r[this.cfg.sortOnSave.name], true);
+            _sortBy(rows, r => r[this.cfg.sortOnSave.name], true);
             if (this.cfg.sortOnSave.descending)
                 rows.reverse(); // mutates
         }
         if (this.cfg.sortObjects) {
-            return (0, js_lib_1._sortObjectDeep)(rows);
+            return _sortObjectDeep(rows);
         }
         return rows;
     }
@@ -161,15 +160,14 @@ class FileDB extends __1.BaseCommonDB {
         if (this.cfg.logStarted) {
             this.cfg.logger?.log(`>> ${op}`);
         }
-        return js_lib_1.localTime.nowUnixMillis();
+        return localTime.nowUnixMillis();
     }
     logFinished(started, op) {
         if (!this.cfg.logFinished)
             return;
-        this.cfg.logger?.log(`<< ${op} ${(0, nodejs_lib_1.dimGrey)(`in ${(0, js_lib_1._since)(started)}`)}`);
+        this.cfg.logger?.log(`<< ${op} ${dimGrey(`in ${_since(started)}`)}`);
     }
 }
-exports.FileDB = FileDB;
 // todo: get back and fix it
 // Implementation is optimized for loading/saving _whole files_.
 /*

package/dist/adapter/file/file.db.model.d.ts

@@ -1,6 +1,6 @@
 import type { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib';
-import type { DBSaveBatchOperation } from '../../db.model';
-import type { DBQueryOrder } from '../../query/dbQuery';
+import type { DBSaveBatchOperation } from '../../db.model.js';
+import type { DBQueryOrder } from '../../query/dbQuery.js';
 export interface FileDBPersistencePlugin {
     ping: () => Promise<void>;
     getTables: () => Promise<string[]>;

package/dist/adapter/file/file.db.model.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/adapter/file/inMemory.persistence.plugin.d.ts

@@ -1,6 +1,6 @@
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib';
-import type { DBSaveBatchOperation } from '../../db.model';
-import type { FileDBPersistencePlugin } from './file.db.model';
+import type { DBSaveBatchOperation } from '../../db.model.js';
+import type { FileDBPersistencePlugin } from './file.db.model.js';
 /**
  * Mostly useful for testing.
  */

package/dist/adapter/file/inMemory.persistence.plugin.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InMemoryPersistencePlugin = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
+import { _by } from '@naturalcycles/js-lib';
 /**
  * Mostly useful for testing.
  */
-class InMemoryPersistencePlugin {
+export class InMemoryPersistencePlugin {
     data = {};
     async ping() { }
     async getTables() {
@@ -16,8 +13,7 @@ class InMemoryPersistencePlugin {
     }
     async saveFiles(ops) {
         ops.forEach(op => {
-            this.data[op.table] = (0, js_lib_1._by)(op.rows, r => r.id);
+            this.data[op.table] = _by(op.rows, r => r.id);
         });
     }
 }
-exports.InMemoryPersistencePlugin = InMemoryPersistencePlugin;

package/dist/adapter/file/index.d.ts

@@ -1,5 +1,5 @@
-import { FileDB } from './file.db';
-import type { FileDBCfg, FileDBPersistencePlugin } from './file.db.model';
-import { LocalFilePersistencePlugin } from './localFile.persistence.plugin';
+import { FileDB } from './file.db.js';
+import type { FileDBCfg, FileDBPersistencePlugin } from './file.db.model.js';
+import { LocalFilePersistencePlugin } from './localFile.persistence.plugin.js';
 export type { FileDBCfg, FileDBPersistencePlugin };
 export { FileDB, LocalFilePersistencePlugin };

package/dist/adapter/file/index.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalFilePersistencePlugin = exports.FileDB = void 0;
-const file_db_1 = require("./file.db");
-Object.defineProperty(exports, "FileDB", { enumerable: true, get: function () { return file_db_1.FileDB; } });
-const localFile_persistence_plugin_1 = require("./localFile.persistence.plugin");
-Object.defineProperty(exports, "LocalFilePersistencePlugin", { enumerable: true, get: function () { return localFile_persistence_plugin_1.LocalFilePersistencePlugin; } });
+import { FileDB } from './file.db.js';
+import { LocalFilePersistencePlugin } from './localFile.persistence.plugin.js';
+export { FileDB, LocalFilePersistencePlugin };

package/dist/adapter/file/localFile.persistence.plugin.d.ts

@@ -1,6 +1,6 @@
 import type { ObjectWithId } from '@naturalcycles/js-lib';
-import type { DBSaveBatchOperation } from '../../db.model';
-import type { FileDBPersistencePlugin } from './file.db.model';
+import type { DBSaveBatchOperation } from '../../db.model.js';
+import type { FileDBPersistencePlugin } from './file.db.model.js';
 export interface LocalFilePersistencePluginCfg {
     /**
      * @default ./tmp/localdb

package/dist/adapter/file/localFile.persistence.plugin.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalFilePersistencePlugin = void 0;
-const node_stream_1 = require("node:stream");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+import { Readable } from 'node:stream';
+import { pMap } from '@naturalcycles/js-lib';
+import { _pipeline, fs2 } from '@naturalcycles/nodejs-lib';
 /**
  * Persists in local filesystem as ndjson.
  */
-class LocalFilePersistencePlugin {
+export class LocalFilePersistencePlugin {
     constructor(cfg = {}) {
         this.cfg = {
             storagePath: './tmp/localdb',
@@ -18,26 +15,25 @@ class LocalFilePersistencePlugin {
     cfg;
     async ping() { }
     async getTables() {
-        return (await nodejs_lib_1.fs2.readdirAsync(this.cfg.storagePath))
+        return (await fs2.readdirAsync(this.cfg.storagePath))
             .filter(f => f.includes('.ndjson'))
             .map(f => f.split('.ndjson')[0]);
     }
     async loadFile(table) {
-        await nodejs_lib_1.fs2.ensureDirAsync(this.cfg.storagePath);
+        await fs2.ensureDirAsync(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        if (!(await nodejs_lib_1.fs2.pathExistsAsync(filePath)))
+        if (!(await fs2.pathExistsAsync(filePath)))
             return [];
-        return await nodejs_lib_1.fs2.createReadStreamAsNDJSON(filePath).toArray();
+        return await fs2.createReadStreamAsNDJSON(filePath).toArray();
     }
     async saveFiles(ops) {
-        await (0, js_lib_1.pMap)(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 32 });
+        await pMap(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 32 });
     }
     async saveFile(table, rows) {
-        await nodejs_lib_1.fs2.ensureDirAsync(this.cfg.storagePath);
+        await fs2.ensureDirAsync(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        await (0, nodejs_lib_1._pipeline)([node_stream_1.Readable.from(rows), ...nodejs_lib_1.fs2.createWriteStreamAsNDJSON(filePath)]);
+        await _pipeline([Readable.from(rows), ...fs2.createWriteStreamAsNDJSON(filePath)]);
     }
 }
-exports.LocalFilePersistencePlugin = LocalFilePersistencePlugin;

package/dist/adapter/file/noop.persistence.plugin.d.ts

@@ -1,6 +1,6 @@
 import type { ObjectWithId } from '@naturalcycles/js-lib';
-import type { DBSaveBatchOperation } from '../../db.model';
-import type { FileDBPersistencePlugin } from './file.db.model';
+import type { DBSaveBatchOperation } from '../../db.model.js';
+import type { FileDBPersistencePlugin } from './file.db.model.js';
 export declare class NoopPersistencePlugin implements FileDBPersistencePlugin {
     ping(): Promise<void>;
     getTables(): Promise<string[]>;

package/dist/adapter/file/noop.persistence.plugin.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NoopPersistencePlugin = void 0;
-class NoopPersistencePlugin {
+export class NoopPersistencePlugin {
     async ping() { }
     async getTables() {
         return [];
@@ -11,4 +8,3 @@ class NoopPersistencePlugin {
     }
     async saveFiles(_ops) { }
 }
-exports.NoopPersistencePlugin = NoopPersistencePlugin;

package/dist/adapter/inmemory/inMemory.db.d.ts

@@ -1,9 +1,9 @@
 import type { AnyObjectWithId, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import type { CommonDB, CommonDBSupport, CommonDBTransactionOptions, DBOperation, DBTransactionFn } from '../..';
-import { CommonDBType } from '../..';
-import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, DBTransaction, RunQueryResult } from '../../db.model';
-import type { DBQuery } from '../../query/dbQuery';
+import type { CommonDB, CommonDBSupport } from '../../common.db.js';
+import { CommonDBType } from '../../common.db.js';
+import type { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBOperation, DBTransaction, DBTransactionFn, RunQueryResult } from '../../db.model.js';
+import type { DBQuery } from '../../query/dbQuery.js';
 export interface InMemoryDBCfg {
     /**
      * @default ''
@@ -74,6 +74,7 @@ export declare class InMemoryDB implements CommonDB {
     runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): Promise<number>;
     streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): ReadableTyped<ROW>;
     runInTransaction(fn: DBTransactionFn, opt?: CommonDBTransactionOptions): Promise<void>;
+    createTransaction(opt?: CommonDBTransactionOptions): Promise<DBTransaction>;
     incrementBatch(table: string, prop: string, incrementMap: StringMap<number>, _opt?: CommonDBOptions): Promise<StringMap<number>>;
     /**
      * Flushes all tables (all namespaces) at once.