@naturalcycles/db-lib 9.14.2 → 9.14.3

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

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

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

@@ -1,4 +1,4 @@
-import { StringMap, ObjectWithId } from '@naturalcycles/js-lib';
+import { ObjectWithId, StringMap } from '@naturalcycles/js-lib';
 import { DBSaveBatchOperation } from '../../db.model';
 import { FileDBPersistencePlugin } from './file.db.model';
 /**

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

@@ -1,4 +1,4 @@
-import { JsonSchemaObject, StringMap, JsonSchemaRootObject, ObjectWithId, CommonLogger } from '@naturalcycles/js-lib';
+import { CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, StringMap } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDB, CommonDBTransactionOptions, CommonDBType, DBOperation, DBPatch, DBTransactionFn } from '../..';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, DBTransaction, RunQueryResult } from '../../db.model';

package/dist/commondao/common.dao.js

@@ -447,7 +447,7 @@ class CommonDao {
      * "Returns", just to have a type of "Saved"
      */
     assignIdCreatedUpdated(obj, opt = {}) {
-        const now = (0, js_lib_1.nowUnix)();
+        const now = js_lib_1.localTime.nowUnix();
         if (this.cfg.useCreatedProperty) {
             obj.created ||= obj.updated || now;
         }

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './commondao/common.dao';
 export * from './commondao/common.dao.model';
 export * from './db.model';
 export * from './kv/commonKeyValueDao';
+export * from './kv/commonKeyValueDaoMemoCache';
 export * from './kv/commonKeyValueDB';
 export * from './model.util';
 export * from './pipeline/dbPipelineBackup';
@@ -14,4 +15,3 @@ export * from './pipeline/dbPipelineCopy';
 export * from './pipeline/dbPipelineRestore';
 export * from './query/dbQuery';
 export * from './transaction/dbTransaction.util';
-export * from './kv/commonKeyValueDaoMemoCache';

package/dist/index.js

@@ -10,6 +10,7 @@ tslib_1.__exportStar(require("./commondao/common.dao"), exports);
 tslib_1.__exportStar(require("./commondao/common.dao.model"), exports);
 tslib_1.__exportStar(require("./db.model"), exports);
 tslib_1.__exportStar(require("./kv/commonKeyValueDao"), exports);
+tslib_1.__exportStar(require("./kv/commonKeyValueDaoMemoCache"), exports);
 tslib_1.__exportStar(require("./kv/commonKeyValueDB"), exports);
 tslib_1.__exportStar(require("./model.util"), exports);
 tslib_1.__exportStar(require("./pipeline/dbPipelineBackup"), exports);
@@ -17,4 +18,3 @@ tslib_1.__exportStar(require("./pipeline/dbPipelineCopy"), exports);
 tslib_1.__exportStar(require("./pipeline/dbPipelineRestore"), exports);
 tslib_1.__exportStar(require("./query/dbQuery"), exports);
 tslib_1.__exportStar(require("./transaction/dbTransaction.util"), exports);
-tslib_1.__exportStar(require("./kv/commonKeyValueDaoMemoCache"), exports);

package/dist/kv/commonKeyValueDaoMemoCache.js

@@ -18,7 +18,7 @@ class CommonKeyValueDaoMemoCache {
         return (await this.cfg.dao.getById(k)) || js_lib_1.MISS;
     }
     async set(k, v) {
-        const opt = this.cfg.ttl ? { expireAt: (0, js_lib_1.nowUnix)() + this.cfg.ttl } : undefined;
+        const opt = this.cfg.ttl ? { expireAt: js_lib_1.localTime.nowUnix() + this.cfg.ttl } : undefined;
         await this.cfg.dao.save(k, v, opt);
     }
     async clear() {

package/dist/model.util.js

@@ -7,14 +7,14 @@ exports.serializeJsonField = serializeJsonField;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function createdUpdatedFields(existingObject) {
-    const now = (0, js_lib_1.nowUnix)();
+    const now = js_lib_1.localTime.nowUnix();
     return {
         created: existingObject?.created || now,
         updated: now,
     };
 }
 function createdUpdatedIdFields(existingObject) {
-    const now = (0, js_lib_1.nowUnix)();
+    const now = js_lib_1.localTime.nowUnix();
     return {
         created: existingObject?.created || now,
         id: existingObject?.id || (0, nodejs_lib_1.stringId)(),

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -1,4 +1,4 @@
-import { AsyncMapper, ErrorMode, UnixTimestampNumber, StringMap } from '@naturalcycles/js-lib';
+import { AsyncMapper, ErrorMode, StringMap, UnixTimestampNumber } from '@naturalcycles/js-lib';
 import { NDJsonStats, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from '../common.db';
 import { DBQuery } from '../index';

package/dist/testing/daoTest.js

@@ -186,7 +186,7 @@ function runCommonDaoTest(db, quirks = {}) {
             // cleanup
             await dao.query().deleteByQuery();
             // Test that id, created, updated are created
-            const now = (0, js_lib_1.nowUnix)();
+            const now = js_lib_1.localTime.nowUnix();
             await dao.runInTransaction(async (tx) => {
                 const row = (0, js_lib_1._omit)(item1, ['id', 'created', 'updated']);
                 await tx.save(dao, row);

package/dist/testing/index.d.ts

@@ -1,6 +1,6 @@
 import { runCommonDaoTest } from './daoTest';
 import { CommonDBImplementationQuirks, runCommonDBTest } from './dbTest';
 import { runCommonKeyValueDBTest } from './keyValueDBTest';
-import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, TestItemBM, testItemBMJsonSchema, testItemBMSchema, TestItemDBM, TestItemTM, testItemTMSchema, TEST_TABLE } from './test.model';
-export type { TestItemDBM, TestItemBM, TestItemTM, CommonDBImplementationQuirks };
-export { TEST_TABLE, createTestItemDBM, createTestItemBM, createTestItemsDBM, createTestItemsBM, testItemBMSchema, testItemTMSchema, testItemBMJsonSchema, runCommonDBTest, runCommonDaoTest, runCommonKeyValueDBTest, };
+import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, TEST_TABLE, TestItemBM, testItemBMJsonSchema, testItemBMSchema, TestItemDBM, TestItemTM, testItemTMSchema } from './test.model';
+export type { CommonDBImplementationQuirks, TestItemBM, TestItemDBM, TestItemTM };
+export { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, runCommonDaoTest, runCommonDBTest, runCommonKeyValueDBTest, TEST_TABLE, testItemBMJsonSchema, testItemBMSchema, testItemTMSchema, };

package/dist/testing/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommonKeyValueDBTest = exports.runCommonDaoTest = exports.runCommonDBTest = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.TEST_TABLE = void 0;
+exports.testItemTMSchema = exports.testItemBMSchema = exports.testItemBMJsonSchema = exports.TEST_TABLE = exports.runCommonKeyValueDBTest = exports.runCommonDBTest = exports.runCommonDaoTest = exports.createTestItemsDBM = exports.createTestItemsBM = exports.createTestItemDBM = exports.createTestItemBM = void 0;
 const daoTest_1 = require("./daoTest");
 Object.defineProperty(exports, "runCommonDaoTest", { enumerable: true, get: function () { return daoTest_1.runCommonDaoTest; } });
 const dbTest_1 = require("./dbTest");
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "createTestItemBM", { enumerable: true, get: func
 Object.defineProperty(exports, "createTestItemDBM", { enumerable: true, get: function () { return test_model_1.createTestItemDBM; } });
 Object.defineProperty(exports, "createTestItemsBM", { enumerable: true, get: function () { return test_model_1.createTestItemsBM; } });
 Object.defineProperty(exports, "createTestItemsDBM", { enumerable: true, get: function () { return test_model_1.createTestItemsDBM; } });
+Object.defineProperty(exports, "TEST_TABLE", { enumerable: true, get: function () { return test_model_1.TEST_TABLE; } });
 Object.defineProperty(exports, "testItemBMJsonSchema", { enumerable: true, get: function () { return test_model_1.testItemBMJsonSchema; } });
 Object.defineProperty(exports, "testItemBMSchema", { enumerable: true, get: function () { return test_model_1.testItemBMSchema; } });
 Object.defineProperty(exports, "testItemTMSchema", { enumerable: true, get: function () { return test_model_1.testItemTMSchema; } });
-Object.defineProperty(exports, "TEST_TABLE", { enumerable: true, get: function () { return test_model_1.TEST_TABLE; } });

package/package.json

@@ -40,7 +40,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "9.14.2",
+  "version": "9.14.3",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/adapter/cachedb/index.ts

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

package/src/adapter/file/file.db.ts

@@ -1,17 +1,17 @@
 import {
-  generateJsonSchemaFromData,
+  _assert,
   _by,
   _deepEquals,
+  _filterUndefinedValues,
   _since,
   _sortBy,
   _sortObjectDeep,
   _stringMapValues,
+  generateJsonSchemaFromData,
   JsonSchemaRootObject,
-  _filterUndefinedValues,
-  _assert,
   ObjectWithId,
 } from '@naturalcycles/js-lib'
-import { readableCreate, ReadableTyped, dimGrey } from '@naturalcycles/nodejs-lib'
+import { dimGrey, readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import {
   BaseCommonDB,
   commonDBFullSupport,

package/src/adapter/file/inMemory.persistence.plugin.ts

@@ -1,4 +1,4 @@
-import { StringMap, _by, ObjectWithId } from '@naturalcycles/js-lib'
+import { _by, ObjectWithId, StringMap } from '@naturalcycles/js-lib'
 import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
 

package/src/adapter/inmemory/inMemory.db.ts

@@ -1,26 +1,26 @@
 import { Readable } from 'node:stream'
 import {
-  generateJsonSchemaFromData,
-  JsonSchemaObject,
-  pMap,
-  StringMap,
+  _assert,
   _by,
+  _deepCopy,
   _since,
   _sortObjectDeep,
-  JsonSchemaRootObject,
-  ObjectWithId,
   _stringMapValues,
   CommonLogger,
-  _deepCopy,
-  _assert,
+  generateJsonSchemaFromData,
+  JsonSchemaObject,
+  JsonSchemaRootObject,
+  ObjectWithId,
+  pMap,
+  StringMap,
 } from '@naturalcycles/js-lib'
 import {
-  bufferReviver,
-  ReadableTyped,
   _pipeline,
+  bufferReviver,
   dimGrey,
-  yellow,
   fs2,
+  ReadableTyped,
+  yellow,
 } from '@naturalcycles/nodejs-lib'
 import {
   CommonDB,

package/src/commondao/common.dao.ts

@@ -18,7 +18,7 @@ import {
   ErrorMode,
   JsonSchemaObject,
   JsonSchemaRootObject,
-  nowUnix,
+  localTime,
   ObjectWithId,
   pMap,
   SKIP,
@@ -605,7 +605,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM> {
    * "Returns", just to have a type of "Saved"
    */
   assignIdCreatedUpdated<T extends BaseDBEntity>(obj: Partial<T>, opt: CommonDaoOptions = {}): T {
-    const now = nowUnix()
+    const now = localTime.nowUnix()
 
     if (this.cfg.useCreatedProperty) {
       obj.created ||= obj.updated || now

package/src/index.ts

@@ -7,6 +7,7 @@ export * from './commondao/common.dao'
 export * from './commondao/common.dao.model'
 export * from './db.model'
 export * from './kv/commonKeyValueDao'
+export * from './kv/commonKeyValueDaoMemoCache'
 export * from './kv/commonKeyValueDB'
 export * from './model.util'
 export * from './pipeline/dbPipelineBackup'
@@ -14,4 +15,3 @@ export * from './pipeline/dbPipelineCopy'
 export * from './pipeline/dbPipelineRestore'
 export * from './query/dbQuery'
 export * from './transaction/dbTransaction.util'
-export * from './kv/commonKeyValueDaoMemoCache'

package/src/kv/commonKeyValueDaoMemoCache.ts

@@ -1,4 +1,4 @@
-import { AsyncMemoCache, MISS, nowUnix, NumberOfSeconds } from '@naturalcycles/js-lib'
+import { AsyncMemoCache, localTime, MISS, NumberOfSeconds } from '@naturalcycles/js-lib'
 import { CommonKeyValueDao } from './commonKeyValueDao'
 
 export interface CommonKeyValueDaoMemoCacheCfg<VALUE> {
@@ -26,7 +26,7 @@ export class CommonKeyValueDaoMemoCache<VALUE = any> implements AsyncMemoCache<s
   }
 
   async set(k: string, v: VALUE): Promise<void> {
-    const opt = this.cfg.ttl ? { expireAt: nowUnix() + this.cfg.ttl } : undefined
+    const opt = this.cfg.ttl ? { expireAt: localTime.nowUnix() + this.cfg.ttl } : undefined
 
     await this.cfg.dao.save(k, v, opt)
   }

package/src/model.util.ts

@@ -1,10 +1,10 @@
-import { CreatedUpdated, CreatedUpdatedId, nowUnix } from '@naturalcycles/js-lib'
+import { CreatedUpdated, CreatedUpdatedId, localTime } from '@naturalcycles/js-lib'
 import { stringId } from '@naturalcycles/nodejs-lib'
 
 export function createdUpdatedFields(
   existingObject?: Partial<CreatedUpdated> | null,
 ): CreatedUpdated {
-  const now = nowUnix()
+  const now = localTime.nowUnix()
   return {
     created: existingObject?.created || now,
     updated: now,
@@ -14,7 +14,7 @@ export function createdUpdatedFields(
 export function createdUpdatedIdFields(
   existingObject?: Partial<CreatedUpdatedId> | null,
 ): CreatedUpdatedId {
-  const now = nowUnix()
+  const now = localTime.nowUnix()
   return {
     created: existingObject?.created || now,
     id: existingObject?.id || stringId(),

package/src/pipeline/dbPipelineBackup.ts

@@ -1,26 +1,26 @@
 import {
+  _passthroughMapper,
   AppError,
   AsyncMapper,
   ErrorMode,
-  pMap,
-  _passthroughMapper,
   localTime,
-  UnixTimestampNumber,
+  pMap,
   StringMap,
+  UnixTimestampNumber,
 } from '@naturalcycles/js-lib'
 import {
+  _pipeline,
+  boldWhite,
+  dimWhite,
+  fs2,
+  grey,
   NDJsonStats,
   transformLogProgress,
   TransformLogProgressOptions,
   transformMap,
   TransformMapOptions,
   transformTap,
-  _pipeline,
-  boldWhite,
-  dimWhite,
-  grey,
   yellow,
-  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'
 import { DBQuery } from '../index'

package/src/pipeline/dbPipelineCopy.ts

@@ -1,12 +1,16 @@
 import {
+  _passthroughMapper,
   AsyncMapper,
+  BaseDBEntity,
   ErrorMode,
-  pMap,
-  _passthroughMapper,
   localTime,
-  BaseDBEntity,
+  pMap,
 } from '@naturalcycles/js-lib'
 import {
+  _pipeline,
+  boldWhite,
+  dimWhite,
+  grey,
   NDJsonStats,
   transformChunk,
   transformLogProgress,
@@ -15,10 +19,6 @@ import {
   TransformMapOptions,
   transformTap,
   writableForEach,
-  _pipeline,
-  boldWhite,
-  dimWhite,
-  grey,
   yellow,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'

package/src/pipeline/dbPipelineRestore.ts

@@ -1,15 +1,20 @@
 import {
-  AsyncMapper,
-  ErrorMode,
-  pMap,
   _hb,
   _mapValues,
   _passthroughMapper,
-  localTime,
-  JsonSchemaObject,
+  AsyncMapper,
   BaseDBEntity,
+  ErrorMode,
+  JsonSchemaObject,
+  localTime,
+  pMap,
 } from '@naturalcycles/js-lib'
 import {
+  _pipeline,
+  boldWhite,
+  dimWhite,
+  fs2,
+  grey,
   NDJsonStats,
   transformChunk,
   transformFilterSync,
@@ -19,12 +24,7 @@ import {
   TransformMapOptions,
   transformTap,
   writableForEach,
-  _pipeline,
-  boldWhite,
-  dimWhite,
-  grey,
   yellow,
-  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'
 import { CommonDBSaveOptions } from '../index'

package/src/query/dbQuery.ts

@@ -1,7 +1,7 @@
 import {
-  AsyncMapper,
-  _truncate,
   _objectAssign,
+  _truncate,
+  AsyncMapper,
   BaseDBEntity,
   ObjectWithId,
 } from '@naturalcycles/js-lib'

package/src/testing/daoTest.ts

@@ -1,18 +1,18 @@
 import { Readable } from 'node:stream'
-import { _deepCopy, _pick, _sortBy, _omit, nowUnix } from '@naturalcycles/js-lib'
+import { _deepCopy, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib'
 import { _pipeline } from '@naturalcycles/nodejs-lib'
 import { CommonDaoLogLevel, DBQuery } from '..'
 import { CommonDB } from '../common.db'
 import { CommonDao } from '../commondao/common.dao'
+import { TestItemBM } from '.'
 import { CommonDBImplementationQuirks, expectMatch } from './dbTest'
 import {
+  createTestItemBM,
   createTestItemsBM,
-  testItemBMSchema,
   TEST_TABLE,
-  createTestItemBM,
   testItemBMJsonSchema,
+  testItemBMSchema,
 } from './test.model'
-import { TestItemBM } from '.'
 
 export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQuirks = {}): void {
   const { support } = db
@@ -255,7 +255,7 @@ export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQui
       await dao.query().deleteByQuery()
 
       // Test that id, created, updated are created
-      const now = nowUnix()
+      const now = localTime.nowUnix()
 
       await dao.runInTransaction(async tx => {
         const row = _omit(item1, ['id', 'created', 'updated'])

package/src/testing/index.ts

@@ -6,27 +6,27 @@ import {
   createTestItemDBM,
   createTestItemsBM,
   createTestItemsDBM,
+  TEST_TABLE,
   TestItemBM,
   testItemBMJsonSchema,
   testItemBMSchema,
   TestItemDBM,
   TestItemTM,
   testItemTMSchema,
-  TEST_TABLE,
 } from './test.model'
 
-export type { TestItemDBM, TestItemBM, TestItemTM, CommonDBImplementationQuirks }
+export type { CommonDBImplementationQuirks, TestItemBM, TestItemDBM, TestItemTM }
 
 export {
-  TEST_TABLE,
-  createTestItemDBM,
   createTestItemBM,
-  createTestItemsDBM,
+  createTestItemDBM,
   createTestItemsBM,
-  testItemBMSchema,
-  testItemTMSchema,
-  testItemBMJsonSchema,
-  runCommonDBTest,
+  createTestItemsDBM,
   runCommonDaoTest,
+  runCommonDBTest,
   runCommonKeyValueDBTest,
+  TEST_TABLE,
+  testItemBMJsonSchema,
+  testItemBMSchema,
+  testItemTMSchema,
 }

package/src/testing/keyValueDaoTest.ts

@@ -1,6 +1,6 @@
 import { _range, _sortBy } from '@naturalcycles/js-lib'
-import { KeyValueDBTuple } from '../kv/commonKeyValueDB'
 import { CommonKeyValueDao } from '../kv/commonKeyValueDao'
+import { KeyValueDBTuple } from '../kv/commonKeyValueDB'
 
 const testIds = _range(1, 4).map(n => `id${n}`)
 const testEntries: KeyValueDBTuple[] = testIds.map(id => [id, Buffer.from(`${id}value`)])

package/src/testing/test.model.ts

@@ -1,4 +1,4 @@
-import { jsonSchema, _range, BaseDBEntity, JsonSchemaObject } from '@naturalcycles/js-lib'
+import { _range, BaseDBEntity, jsonSchema, JsonSchemaObject } from '@naturalcycles/js-lib'
 import {
   baseDBEntitySchema,
   binarySchema,